@tahminator/sapling 2.0.1 → 2.0.2-beta.131088cd
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/dist/index.cjs +15 -3
- package/dist/index.d.cts +1 -1
- package/dist/index.d.mts +1 -1
- package/dist/index.mjs +15 -3
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -549,7 +549,10 @@ function _getRequestSchemas(ctor, fnName) {
|
|
|
549
549
|
}
|
|
550
550
|
async function _parseOrThrow(schema, input, kind) {
|
|
551
551
|
const result = await schema["~standard"].validate(input);
|
|
552
|
-
if (result.issues)
|
|
552
|
+
if (result.issues) {
|
|
553
|
+
console.debug(`Failed to parse a schema`);
|
|
554
|
+
throw new ParserError(kind, result.issues, schema["~standard"].vendor);
|
|
555
|
+
}
|
|
553
556
|
return result.value;
|
|
554
557
|
}
|
|
555
558
|
//#endregion
|
|
@@ -691,7 +694,15 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
|
|
|
691
694
|
if (schemas) {
|
|
692
695
|
if (schemas.body) request.body = await _parseOrThrow(schemas.body, request.body, "reqbody");
|
|
693
696
|
if (schemas.param) request.params = await _parseOrThrow(schemas.param, request.params, "reqparams");
|
|
694
|
-
if (schemas.query)
|
|
697
|
+
if (schemas.query) {
|
|
698
|
+
const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
|
|
699
|
+
if (request.query && typeof request.query === "object") {
|
|
700
|
+
Object.keys(request.query).forEach((key) => {
|
|
701
|
+
delete request.query[key];
|
|
702
|
+
});
|
|
703
|
+
Object.assign(request.query, parsedQuery);
|
|
704
|
+
}
|
|
705
|
+
}
|
|
695
706
|
}
|
|
696
707
|
const result = await fn.bind(controllerInstance)(request, response, next);
|
|
697
708
|
if (result instanceof ResponseEntity) {
|
|
@@ -741,8 +752,9 @@ DefaultBaseErrorMiddleware = __decorate([MiddlewareClass()], DefaultBaseErrorMid
|
|
|
741
752
|
//#endregion
|
|
742
753
|
//#region src/middleware/default/responsestatus.ts
|
|
743
754
|
let DefaultResponseStatusErrorMiddleware = class DefaultResponseStatusErrorMiddleware {
|
|
744
|
-
handle(err, _request, _response,
|
|
755
|
+
handle(err, _request, _response, next) {
|
|
745
756
|
if (err instanceof ResponseStatusError) return ResponseEntity.status(err.status).body({ message: err.message });
|
|
757
|
+
next(err);
|
|
746
758
|
}
|
|
747
759
|
};
|
|
748
760
|
__decorate([Middleware()], DefaultResponseStatusErrorMiddleware.prototype, "handle", null);
|
package/dist/index.d.cts
CHANGED
|
@@ -509,7 +509,7 @@ declare class DefaultBaseErrorMiddleware {
|
|
|
509
509
|
//#endregion
|
|
510
510
|
//#region src/middleware/default/responsestatus.d.ts
|
|
511
511
|
declare class DefaultResponseStatusErrorMiddleware {
|
|
512
|
-
handle(err: unknown, _request: Request, _response: Response,
|
|
512
|
+
handle(err: unknown, _request: Request, _response: Response, next: NextFunction): ResponseEntity<{
|
|
513
513
|
message: string;
|
|
514
514
|
}> | undefined;
|
|
515
515
|
}
|
package/dist/index.d.mts
CHANGED
|
@@ -509,7 +509,7 @@ declare class DefaultBaseErrorMiddleware {
|
|
|
509
509
|
//#endregion
|
|
510
510
|
//#region src/middleware/default/responsestatus.d.ts
|
|
511
511
|
declare class DefaultResponseStatusErrorMiddleware {
|
|
512
|
-
handle(err: unknown, _request: Request, _response: Response,
|
|
512
|
+
handle(err: unknown, _request: Request, _response: Response, next: NextFunction): ResponseEntity<{
|
|
513
513
|
message: string;
|
|
514
514
|
}> | undefined;
|
|
515
515
|
}
|
package/dist/index.mjs
CHANGED
|
@@ -525,7 +525,10 @@ function _getRequestSchemas(ctor, fnName) {
|
|
|
525
525
|
}
|
|
526
526
|
async function _parseOrThrow(schema, input, kind) {
|
|
527
527
|
const result = await schema["~standard"].validate(input);
|
|
528
|
-
if (result.issues)
|
|
528
|
+
if (result.issues) {
|
|
529
|
+
console.debug(`Failed to parse a schema`);
|
|
530
|
+
throw new ParserError(kind, result.issues, schema["~standard"].vendor);
|
|
531
|
+
}
|
|
529
532
|
return result.value;
|
|
530
533
|
}
|
|
531
534
|
//#endregion
|
|
@@ -667,7 +670,15 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
|
|
|
667
670
|
if (schemas) {
|
|
668
671
|
if (schemas.body) request.body = await _parseOrThrow(schemas.body, request.body, "reqbody");
|
|
669
672
|
if (schemas.param) request.params = await _parseOrThrow(schemas.param, request.params, "reqparams");
|
|
670
|
-
if (schemas.query)
|
|
673
|
+
if (schemas.query) {
|
|
674
|
+
const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
|
|
675
|
+
if (request.query && typeof request.query === "object") {
|
|
676
|
+
Object.keys(request.query).forEach((key) => {
|
|
677
|
+
delete request.query[key];
|
|
678
|
+
});
|
|
679
|
+
Object.assign(request.query, parsedQuery);
|
|
680
|
+
}
|
|
681
|
+
}
|
|
671
682
|
}
|
|
672
683
|
const result = await fn.bind(controllerInstance)(request, response, next);
|
|
673
684
|
if (result instanceof ResponseEntity) {
|
|
@@ -717,8 +728,9 @@ DefaultBaseErrorMiddleware = __decorate([MiddlewareClass()], DefaultBaseErrorMid
|
|
|
717
728
|
//#endregion
|
|
718
729
|
//#region src/middleware/default/responsestatus.ts
|
|
719
730
|
let DefaultResponseStatusErrorMiddleware = class DefaultResponseStatusErrorMiddleware {
|
|
720
|
-
handle(err, _request, _response,
|
|
731
|
+
handle(err, _request, _response, next) {
|
|
721
732
|
if (err instanceof ResponseStatusError) return ResponseEntity.status(err.status).body({ message: err.message });
|
|
733
|
+
next(err);
|
|
722
734
|
}
|
|
723
735
|
};
|
|
724
736
|
__decorate([Middleware()], DefaultResponseStatusErrorMiddleware.prototype, "handle", null);
|