@tahminator/sapling 2.0.0 → 2.0.2-beta.131088cd

package/dist/index.cjs

@@ -237,6 +237,30 @@ var ResponseStatusError = class ResponseStatusError extends Error {
 	}
 };
 //#endregion
+//#region src/helper/error/parse.ts
+/**
+* This error should be thrown when some data cannot be parsed by a given schema.
+*/
+var ParserError = class ParserError extends ResponseStatusError {
+	constructor(location, issues, vendor) {
+		super(400, ParserError.formatMessage(location, issues, vendor));
+		Object.setPrototypeOf(this, new.target.prototype);
+	}
+	static formatMessage(location, issues, vendor) {
+		const formatted = issues.map((i) => {
+			const path = Array.isArray(i.path) ? i.path.map((seg) => typeof seg === "object" && seg ? String(seg.key) : String(seg)).join(".") : "";
+			return path ? `${path}: ${i.message}` : i.message;
+		}).join("; ");
+		return `${vendor} failed to parse ${(() => {
+			switch (location) {
+				case "reqbody": return "request body";
+				case "reqparams": return "request params";
+				case "reqquery": return "request query";
+			}
+		})()}: ${formatted}`;
+	}
+};
+//#endregion
 //#region src/helper/sapling.ts
 const settings = {
 	serialize: JSON.stringify,
@@ -479,30 +503,6 @@ function _resolve(ctor) {
 	return _InjectableRegistry.get(ctor);
 }
 //#endregion
-//#region src/helper/error/exception.ts
-/**
-* This error should be thrown when some data cannot be parsed by a given schema.
-*/
-var ParserError = class ParserError extends ResponseStatusError {
-	constructor(location, issues, vendor) {
-		super(400, ParserError.formatMessage(location, issues, vendor));
-		Object.setPrototypeOf(this, new.target.prototype);
-	}
-	static formatMessage(location, issues, vendor) {
-		const formatted = issues.map((i) => {
-			const path = Array.isArray(i.path) ? i.path.map((seg) => typeof seg === "object" && seg ? String(seg.key) : String(seg)).join(".") : "";
-			return path ? `${path}: ${i.message}` : i.message;
-		}).join("; ");
-		return `${vendor} failed to parse ${(() => {
-			switch (location) {
-				case "reqbody": return "request body";
-				case "reqparams": return "request params";
-				case "reqquery": return "request query";
-			}
-		})()}: ${formatted}`;
-	}
-};
-//#endregion
 //#region src/annotation/request.ts
 const _requestSchemaStore = /* @__PURE__ */ new WeakMap();
 function _getOrCreateRequestSchemaDefinition(ctor, fnName) {
@@ -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,15 @@ 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) {
+						const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
+						if (request.query && typeof request.query === "object") {
+							Object.keys(request.query).forEach((key) => {
+								delete request.query[key];
+							});
+							Object.assign(request.query, parsedQuery);
+						}
+					}
 				}
 				const result = await fn.bind(controllerInstance)(request, response, next);
 				if (result instanceof ResponseEntity) {
@@ -721,8 +732,48 @@ function MiddlewareClass(...args) {
 	return Controller(...args);
 }
 //#endregion
+//#region \0@oxc-project+runtime@0.127.0/helpers/decorate.js
+function __decorate(decorators, target, key, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+	return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+//#endregion
+//#region src/middleware/default/base.ts
+let DefaultBaseErrorMiddleware = class DefaultBaseErrorMiddleware {
+	handle(err, _request, _response, _next) {
+		console.error("[Error]", err);
+		return ResponseEntity.status(500).body({ message: "Internal Server Error" });
+	}
+};
+__decorate([Middleware()], DefaultBaseErrorMiddleware.prototype, "handle", null);
+DefaultBaseErrorMiddleware = __decorate([MiddlewareClass()], DefaultBaseErrorMiddleware);
+//#endregion
+//#region src/middleware/default/responsestatus.ts
+let DefaultResponseStatusErrorMiddleware = class DefaultResponseStatusErrorMiddleware {
+	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);
+DefaultResponseStatusErrorMiddleware = __decorate([MiddlewareClass()], DefaultResponseStatusErrorMiddleware);
+//#endregion
 exports.Controller = Controller;
 exports.DELETE = DELETE;
+Object.defineProperty(exports, "DefaultBaseErrorMiddleware", {
+	enumerable: true,
+	get: function() {
+		return DefaultBaseErrorMiddleware;
+	}
+});
+Object.defineProperty(exports, "DefaultResponseStatusErrorMiddleware", {
+	enumerable: true,
+	get: function() {
+		return DefaultResponseStatusErrorMiddleware;
+	}
+});
 exports.GET = GET;
 exports.HEAD = HEAD;
 exports.Html404ErrorPage = Html404ErrorPage;

package/dist/index.d.cts

@@ -397,6 +397,16 @@ declare class ResponseStatusError extends Error {
   constructor(status: HttpStatus, message?: string);
 }
 //#endregion
+//#region src/helper/error/parse.d.ts
+type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery";
+/**
+ * This error should be thrown when some data cannot be parsed by a given schema.
+ */
+declare class ParserError extends ResponseStatusError {
+  constructor(location: ParserErrorLocation, issues: readonly StandardSchemaV1.Issue[], vendor: string);
+  private static formatMessage;
+}
+//#endregion
 //#region src/helper/sapling.d.ts
 /**
  * Collection of utility functions which are essential for Sapling to function.
@@ -473,16 +483,6 @@ declare class Sapling {
   static setDeserializeFn(this: void, fn: (value: string) => any): void;
 }
 //#endregion
-//#region src/helper/error/exception.d.ts
-type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery";
-/**
- * This error should be thrown when some data cannot be parsed by a given schema.
- */
-declare class ParserError extends ResponseStatusError {
-  constructor(location: ParserErrorLocation, issues: readonly StandardSchemaV1.Issue[], vendor: string);
-  private static formatMessage;
-}
-//#endregion
 //#region src/annotation/request.d.ts
 type RequestSchemaDefinition = {
   body?: StandardSchemaV1;
@@ -495,4 +495,23 @@ declare function RequestQuery(schema: StandardSchemaV1): MethodDecorator;
 declare function _getRequestSchemas(ctor: Function, fnName: string): RequestSchemaDefinition | undefined;
 declare function _parseOrThrow<TSchema extends StandardSchemaV1>(schema: TSchema, input: unknown, kind: ParserErrorLocation): Promise<StandardSchemaV1.InferOutput<TSchema>>;
 //#endregion
-export { Class, Controller, DELETE, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteDefinition, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getRequestSchemas, _getRoutes, _parseOrThrow, _resolve, methodResolve };
+//#region src/middleware/default/base.d.ts
+/**
+ * This should be registered last in the middleware chain.
+ *
+ * All exception messages are hidden from the request by default.
+ */
+declare class DefaultBaseErrorMiddleware {
+  handle(err: unknown, _request: Request, _response: Response, _next: NextFunction): ResponseEntity<{
+    message: string;
+  }>;
+}
+//#endregion
+//#region src/middleware/default/responsestatus.d.ts
+declare class DefaultResponseStatusErrorMiddleware {
+  handle(err: unknown, _request: Request, _response: Response, next: NextFunction): ResponseEntity<{
+    message: string;
+  }> | undefined;
+}
+//#endregion
+export { Class, Controller, DELETE, DefaultBaseErrorMiddleware, DefaultResponseStatusErrorMiddleware, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteDefinition, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getRequestSchemas, _getRoutes, _parseOrThrow, _resolve, methodResolve };

package/dist/index.d.mts

@@ -397,6 +397,16 @@ declare class ResponseStatusError extends Error {
   constructor(status: HttpStatus, message?: string);
 }
 //#endregion
+//#region src/helper/error/parse.d.ts
+type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery";
+/**
+ * This error should be thrown when some data cannot be parsed by a given schema.
+ */
+declare class ParserError extends ResponseStatusError {
+  constructor(location: ParserErrorLocation, issues: readonly StandardSchemaV1.Issue[], vendor: string);
+  private static formatMessage;
+}
+//#endregion
 //#region src/helper/sapling.d.ts
 /**
  * Collection of utility functions which are essential for Sapling to function.
@@ -473,16 +483,6 @@ declare class Sapling {
   static setDeserializeFn(this: void, fn: (value: string) => any): void;
 }
 //#endregion
-//#region src/helper/error/exception.d.ts
-type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery";
-/**
- * This error should be thrown when some data cannot be parsed by a given schema.
- */
-declare class ParserError extends ResponseStatusError {
-  constructor(location: ParserErrorLocation, issues: readonly StandardSchemaV1.Issue[], vendor: string);
-  private static formatMessage;
-}
-//#endregion
 //#region src/annotation/request.d.ts
 type RequestSchemaDefinition = {
   body?: StandardSchemaV1;
@@ -495,4 +495,23 @@ declare function RequestQuery(schema: StandardSchemaV1): MethodDecorator;
 declare function _getRequestSchemas(ctor: Function, fnName: string): RequestSchemaDefinition | undefined;
 declare function _parseOrThrow<TSchema extends StandardSchemaV1>(schema: TSchema, input: unknown, kind: ParserErrorLocation): Promise<StandardSchemaV1.InferOutput<TSchema>>;
 //#endregion
-export { Class, Controller, DELETE, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteDefinition, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getRequestSchemas, _getRoutes, _parseOrThrow, _resolve, methodResolve };
+//#region src/middleware/default/base.d.ts
+/**
+ * This should be registered last in the middleware chain.
+ *
+ * All exception messages are hidden from the request by default.
+ */
+declare class DefaultBaseErrorMiddleware {
+  handle(err: unknown, _request: Request, _response: Response, _next: NextFunction): ResponseEntity<{
+    message: string;
+  }>;
+}
+//#endregion
+//#region src/middleware/default/responsestatus.d.ts
+declare class DefaultResponseStatusErrorMiddleware {
+  handle(err: unknown, _request: Request, _response: Response, next: NextFunction): ResponseEntity<{
+    message: string;
+  }> | undefined;
+}
+//#endregion
+export { Class, Controller, DELETE, DefaultBaseErrorMiddleware, DefaultResponseStatusErrorMiddleware, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteDefinition, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getRequestSchemas, _getRoutes, _parseOrThrow, _resolve, methodResolve };

package/dist/index.mjs

@@ -213,6 +213,30 @@ var ResponseStatusError = class ResponseStatusError extends Error {
 	}
 };
 //#endregion
+//#region src/helper/error/parse.ts
+/**
+* This error should be thrown when some data cannot be parsed by a given schema.
+*/
+var ParserError = class ParserError extends ResponseStatusError {
+	constructor(location, issues, vendor) {
+		super(400, ParserError.formatMessage(location, issues, vendor));
+		Object.setPrototypeOf(this, new.target.prototype);
+	}
+	static formatMessage(location, issues, vendor) {
+		const formatted = issues.map((i) => {
+			const path = Array.isArray(i.path) ? i.path.map((seg) => typeof seg === "object" && seg ? String(seg.key) : String(seg)).join(".") : "";
+			return path ? `${path}: ${i.message}` : i.message;
+		}).join("; ");
+		return `${vendor} failed to parse ${(() => {
+			switch (location) {
+				case "reqbody": return "request body";
+				case "reqparams": return "request params";
+				case "reqquery": return "request query";
+			}
+		})()}: ${formatted}`;
+	}
+};
+//#endregion
 //#region src/helper/sapling.ts
 const settings = {
 	serialize: JSON.stringify,
@@ -455,30 +479,6 @@ function _resolve(ctor) {
 	return _InjectableRegistry.get(ctor);
 }
 //#endregion
-//#region src/helper/error/exception.ts
-/**
-* This error should be thrown when some data cannot be parsed by a given schema.
-*/
-var ParserError = class ParserError extends ResponseStatusError {
-	constructor(location, issues, vendor) {
-		super(400, ParserError.formatMessage(location, issues, vendor));
-		Object.setPrototypeOf(this, new.target.prototype);
-	}
-	static formatMessage(location, issues, vendor) {
-		const formatted = issues.map((i) => {
-			const path = Array.isArray(i.path) ? i.path.map((seg) => typeof seg === "object" && seg ? String(seg.key) : String(seg)).join(".") : "";
-			return path ? `${path}: ${i.message}` : i.message;
-		}).join("; ");
-		return `${vendor} failed to parse ${(() => {
-			switch (location) {
-				case "reqbody": return "request body";
-				case "reqparams": return "request params";
-				case "reqquery": return "request query";
-			}
-		})()}: ${formatted}`;
-	}
-};
-//#endregion
 //#region src/annotation/request.ts
 const _requestSchemaStore = /* @__PURE__ */ new WeakMap();
 function _getOrCreateRequestSchemaDefinition(ctor, fnName) {
@@ -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,15 @@ 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) {
+						const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
+						if (request.query && typeof request.query === "object") {
+							Object.keys(request.query).forEach((key) => {
+								delete request.query[key];
+							});
+							Object.assign(request.query, parsedQuery);
+						}
+					}
 				}
 				const result = await fn.bind(controllerInstance)(request, response, next);
 				if (result instanceof ResponseEntity) {
@@ -697,4 +708,32 @@ function MiddlewareClass(...args) {
 	return Controller(...args);
 }
 //#endregion
-export { Controller, DELETE, GET, HEAD, Html404ErrorPage, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getRequestSchemas, _getRoutes, _parseOrThrow, _resolve, methodResolve };
+//#region \0@oxc-project+runtime@0.127.0/helpers/decorate.js
+function __decorate(decorators, target, key, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+	return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+//#endregion
+//#region src/middleware/default/base.ts
+let DefaultBaseErrorMiddleware = class DefaultBaseErrorMiddleware {
+	handle(err, _request, _response, _next) {
+		console.error("[Error]", err);
+		return ResponseEntity.status(500).body({ message: "Internal Server Error" });
+	}
+};
+__decorate([Middleware()], DefaultBaseErrorMiddleware.prototype, "handle", null);
+DefaultBaseErrorMiddleware = __decorate([MiddlewareClass()], DefaultBaseErrorMiddleware);
+//#endregion
+//#region src/middleware/default/responsestatus.ts
+let DefaultResponseStatusErrorMiddleware = class DefaultResponseStatusErrorMiddleware {
+	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);
+DefaultResponseStatusErrorMiddleware = __decorate([MiddlewareClass()], DefaultResponseStatusErrorMiddleware);
+//#endregion
+export { Controller, DELETE, DefaultBaseErrorMiddleware, DefaultResponseStatusErrorMiddleware, GET, HEAD, Html404ErrorPage, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getRequestSchemas, _getRoutes, _parseOrThrow, _resolve, methodResolve };

package/package.json

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