@tahminator/sapling 2.0.1 → 2.0.2-beta.3bec30d8

package/dist/index.cjs

@@ -549,7 +549,10 @@ function _getRequestSchemas(ctor, fnName) {
 }
 async function _parseOrThrow(schema, input, kind) {
 	const result = await schema["~standard"].validate(input);
-	if (result.issues) throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	if (result.issues) {
+		console.debug(`Failed to parse a schema`);
+		throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	}
 	return result.value;
 }
 //#endregion
@@ -691,7 +694,19 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
 				if (schemas) {
 					if (schemas.body) request.body = await _parseOrThrow(schemas.body, request.body, "reqbody");
 					if (schemas.param) request.params = await _parseOrThrow(schemas.param, request.params, "reqparams");
-					if (schemas.query) request.query = await _parseOrThrow(schemas.query, request.query, "reqquery");
+					if (schemas.query) {
+						console.log("schemas.query exists");
+						console.log("schemas.query exists as " + { query: schemas.query });
+						const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
+						console.log({ parsedQuery });
+						if (request.query && typeof request.query === "object") {
+							Object.keys(request.query).forEach((key) => {
+								console.log(`request.query[${key}]`);
+								delete request.query[key];
+							});
+							Object.assign(request.query, parsedQuery);
+						} else console.log("request.query does not exist or is not object", { query: request.query });
+					}
 				}
 				const result = await fn.bind(controllerInstance)(request, response, next);
 				if (result instanceof ResponseEntity) {
@@ -741,8 +756,9 @@ DefaultBaseErrorMiddleware = __decorate([MiddlewareClass()], DefaultBaseErrorMid
 //#endregion
 //#region src/middleware/default/responsestatus.ts
 let DefaultResponseStatusErrorMiddleware = class DefaultResponseStatusErrorMiddleware {
-	handle(err, _request, _response, _next) {
+	handle(err, _request, _response, next) {
 		if (err instanceof ResponseStatusError) return ResponseEntity.status(err.status).body({ message: err.message });
+		next(err);
 	}
 };
 __decorate([Middleware()], DefaultResponseStatusErrorMiddleware.prototype, "handle", null);

package/dist/index.d.cts

@@ -509,7 +509,7 @@ declare class DefaultBaseErrorMiddleware {
 //#endregion
 //#region src/middleware/default/responsestatus.d.ts
 declare class DefaultResponseStatusErrorMiddleware {
-  handle(err: unknown, _request: Request, _response: Response, _next: NextFunction): ResponseEntity<{
+  handle(err: unknown, _request: Request, _response: Response, next: NextFunction): ResponseEntity<{
     message: string;
   }> | undefined;
 }

package/dist/index.d.mts

@@ -509,7 +509,7 @@ declare class DefaultBaseErrorMiddleware {
 //#endregion
 //#region src/middleware/default/responsestatus.d.ts
 declare class DefaultResponseStatusErrorMiddleware {
-  handle(err: unknown, _request: Request, _response: Response, _next: NextFunction): ResponseEntity<{
+  handle(err: unknown, _request: Request, _response: Response, next: NextFunction): ResponseEntity<{
     message: string;
   }> | undefined;
 }

package/dist/index.mjs

@@ -525,7 +525,10 @@ function _getRequestSchemas(ctor, fnName) {
 }
 async function _parseOrThrow(schema, input, kind) {
 	const result = await schema["~standard"].validate(input);
-	if (result.issues) throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	if (result.issues) {
+		console.debug(`Failed to parse a schema`);
+		throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	}
 	return result.value;
 }
 //#endregion
@@ -667,7 +670,19 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
 				if (schemas) {
 					if (schemas.body) request.body = await _parseOrThrow(schemas.body, request.body, "reqbody");
 					if (schemas.param) request.params = await _parseOrThrow(schemas.param, request.params, "reqparams");
-					if (schemas.query) request.query = await _parseOrThrow(schemas.query, request.query, "reqquery");
+					if (schemas.query) {
+						console.log("schemas.query exists");
+						console.log("schemas.query exists as " + { query: schemas.query });
+						const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
+						console.log({ parsedQuery });
+						if (request.query && typeof request.query === "object") {
+							Object.keys(request.query).forEach((key) => {
+								console.log(`request.query[${key}]`);
+								delete request.query[key];
+							});
+							Object.assign(request.query, parsedQuery);
+						} else console.log("request.query does not exist or is not object", { query: request.query });
+					}
 				}
 				const result = await fn.bind(controllerInstance)(request, response, next);
 				if (result instanceof ResponseEntity) {
@@ -717,8 +732,9 @@ DefaultBaseErrorMiddleware = __decorate([MiddlewareClass()], DefaultBaseErrorMid
 //#endregion
 //#region src/middleware/default/responsestatus.ts
 let DefaultResponseStatusErrorMiddleware = class DefaultResponseStatusErrorMiddleware {
-	handle(err, _request, _response, _next) {
+	handle(err, _request, _response, next) {
 		if (err instanceof ResponseStatusError) return ResponseEntity.status(err.status).body({ message: err.message });
+		next(err);
 	}
 };
 __decorate([Middleware()], DefaultResponseStatusErrorMiddleware.prototype, "handle", null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tahminator/sapling",
-  "version": "2.0.1",
+  "version": "2.0.2-beta.3bec30d8",
   "author": "Tahmid Ahmed",
   "description": "A library to help you write cleaner Express.js code",
   "repository": {