@sentzunhat/zacatl 0.0.0-alpha.6 → 0.0.0-alpha.7

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentzunhat/zacatl",
   "main": "src/index.ts",
   "module": "src/index.ts",
-  "version": "0.0.0-alpha.6",
+  "version": "0.0.0-alpha.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/sentzunhat/zacatl.git"

package/src/micro-service/architecture/application/entry-points/rest/common/handler.ts

@@ -1,8 +1,13 @@
+import { z } from "zod";
 import { FastifyReply } from "fastify";
 
 import { Request } from "./request";
 
-export type Handler<TBody, TParams = void> = (
-  request: Request<TBody, TParams>,
+export type Handler<
+  TBody,
+  TQuerystring = z.ZodSchema<Record<string, string>>,
+  TParams = void
+> = (
+  request: Request<TBody, TQuerystring, TParams>,
   reply: FastifyReply
 ) => Promise<void>;

package/src/micro-service/architecture/application/entry-points/rest/common/request.ts

@@ -2,13 +2,16 @@ import { z } from "zod";
 import { IncomingMessage } from "http";
 import { FastifySchema, FastifyRequest, RawServerBase } from "fastify";
 
-export type Request<TBody, TParams = void> = FastifyRequest<
+export type Request<
+  TBody,
+  TQuerystring = z.ZodSchema<Record<string, string>>,
+  TParams = void
+> = FastifyRequest<
   {
     Body: TBody;
+    Querystring: TQuerystring;
     Params: TParams;
-    Schema: z.ZodSchema<TBody>;
     Headers: z.ZodSchema<Record<string, string>>;
-    Querystring: z.ZodSchema<Record<string, string>>;
   },
   RawServerBase,
   IncomingMessage,

package/src/micro-service/architecture/application/entry-points/rest/route-handlers/abstract.ts

@@ -1,4 +1,5 @@
 import i18n from "i18n";
+import { z } from "zod";
 import { HTTPMethods, FastifySchema, FastifyReply } from "fastify";
 
 import { RouteHandler } from "./route-handler";
@@ -14,9 +15,10 @@ export type HandlerOutput<TResponse> = TResponse;
 
 export abstract class AbstractRouteHandler<
   TBody = void,
+  TQuerystring = z.ZodSchema<Record<string, string>>,
   TResponse = void,
-  TParams = void,
-> implements RouteHandler<TBody, TParams>
+  TParams = void
+> implements RouteHandler<TBody, TQuerystring, TParams>
 {
   public url: string;
   public method: HTTPMethods;
@@ -29,12 +31,12 @@ export abstract class AbstractRouteHandler<
   }
 
   abstract handler(
-    request: Request<TBody, TParams>,
+    request: Request<TBody, TQuerystring, TParams>,
     reply: FastifyReply
   ): Promise<HandlerOutput<TResponse>> | HandlerOutput<TResponse>;
 
   public async execute(
-    request: Request<TBody, TParams>,
+    request: Request<TBody, TQuerystring, TParams>,
     reply: FastifyReply
   ): Promise<void> {
     const response = await this.handler(request, reply);

package/src/micro-service/architecture/application/entry-points/rest/route-handlers/route-handler.ts

@@ -1,10 +1,15 @@
+import { z } from "zod";
 import { FastifySchema, HTTPMethods } from "fastify";
 
 import { Handler } from "../common/handler";
 
-export type RouteHandler<TBody = void, TParams = void> = {
+export type RouteHandler<
+  TBody = void,
+  TQuerystring = z.ZodSchema<Record<string, string>>,
+  TParams = void
+> = {
   url: string;
   method: HTTPMethods;
   schema: FastifySchema;
-  execute: Handler<TBody, TParams>;
+  execute: Handler<TBody, TQuerystring, TParams>;
 };

package/test/unit/micro-service/architecture/application/application.test.ts

@@ -25,7 +25,7 @@ class DummyRouteHandler extends AbstractRouteHandler {
     });
   }
 
-  handler(_: Request<void, void>): void | Promise<void> {}
+  handler(_: Request<void, {}>): void | Promise<void> {}
 }
 
 const fakeConfig: ConfigApplication = {

package/test/unit/micro-service/architecture/application/entry-points/rest/route-handlers/abstract.test.ts

@@ -20,7 +20,7 @@ describe("AbstractRouteHandler", () => {
   it("executes the handler and sends the proper response", async () => {
     vi.spyOn(i18n, "__").mockReturnValue("Default success");
 
-    const fakeRequest = createFakeFastifyRequest() as Request<unknown, unknown>;
+    const fakeRequest = createFakeFastifyRequest() as Request<unknown, string>;
 
     const fakeReply: any = createFakeFastifyReply();
 

package/test/unit/micro-service/architecture/application/entry-points/rest/route-handlers/get-route-handler.test.ts

@@ -23,7 +23,7 @@ describe("GetRouteHandler", () => {
       schema: {}, // Use an empty schema for test purposes.
     });
 
-    const fakeRequest = createFakeFastifyRequest() as Request<unknown, unknown>;
+    const fakeRequest = createFakeFastifyRequest() as Request<unknown, string>;
     const fakeReply = createFakeFastifyReply();
 
     await testHandler.execute(fakeRequest, fakeReply);

package/test/unit/micro-service/architecture/application/entry-points/rest/route-handlers/post-route-handler.test.ts

@@ -25,7 +25,7 @@ describe("PostRouteHandler", () => {
       schema: {}, // Use an empty schema for test purposes.
     });
 
-    const fakeRequest = createFakeFastifyRequest() as Request<unknown, unknown>;
+    const fakeRequest = createFakeFastifyRequest() as Request<unknown, string>;
     const fakeReply = createFakeFastifyReply();
 
     await testHandler.execute(fakeRequest, fakeReply);