[up] upgrade integration with [email protected]

leomerida15 · Oct 15, 2023 · 0a2a3b0 · 0a2a3b0
1 parent 09b20b2
commit 0a2a3b0
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 63 deletions.
diff --git a/src/resolvers/yup/ValidAndFormat.ts b/src/resolvers/yup/ValidAndFormat.ts
@@ -38,37 +38,37 @@ export default class ValidAndFormat<
 		return this.Schemas.context.validateSync(this.NativeContext);
 	}
 
-	private getQueryWhoNoHasSchema(
-		queriesArray: Array<keyof InferType<Q>>,
-	): Partial<InferType<Q>> {
-		//
-		const resQueries: any = {};
+	private getQueryWhoNoHasSchema() {
+		return (queriesArray: Array<keyof InferType<Q>>): Partial<InferType<Q>> => {
+			//
+			const resQueries: any = {};
 
-		const symbolsReq = Object.getOwnPropertySymbols(this.nativeRequest);
+			const symbolsReq = Object.getOwnPropertySymbols(this.nativeRequest);
 
-		const UrlNative = symbolsReq
-			.filter((S) => {
-				//@ts-ignore
-				const item = this.nativeRequest[S];
+			const UrlNative = symbolsReq
+				.filter((S) => {
+					//@ts-ignore
+					const item = this.nativeRequest[S];
 
-				return item?.url;
-			})
-			.map<URL>((S) => {
-				//@ts-ignore
-				const item = this.nativeRequest[S];
+					return item?.url;
+				})
+				.map<URL>((S) => {
+					//@ts-ignore
+					const item = this.nativeRequest[S];
 
-				return item?.url;
-			})[0];
+					return item?.url;
+				})[0];
 
-		const validUrlNative = Object.keys(this.nativeRequest).includes("url");
+			const validUrlNative = Object.keys(this.nativeRequest).includes("url");
 
-		const url = validUrlNative ? new URL(this.nativeRequest.url) : UrlNative;
+			const url = validUrlNative ? new URL(this.nativeRequest.url) : UrlNative;
 
-		queriesArray.map((q) => {
-			resQueries[q] = url.searchParams.get(String(q));
-		});
+			queriesArray.map((q) => {
+				resQueries[q] = url.searchParams.get(String(q));
+			});
 
-		return resQueries;
+			return resQueries;
+		};
 	}
 
 	private createGetQueryWhoHasSchema(queryFormat: InferType<Q>) {
@@ -86,11 +86,11 @@ export default class ValidAndFormat<
 	}
 
 	query() {
-		if (!this.Schemas?.query) return this.getQueryWhoNoHasSchema;
+		if (!this.Schemas?.query) return this.getQueryWhoNoHasSchema();
 
 		const keys = Object.keys(this.Schemas.query.fields);
 
-		const query = this.getQueryWhoNoHasSchema(keys);
+		const query = this.getQueryWhoNoHasSchema()(keys);
 
 		const queryFormat = this.Schemas.query.validateSync(query) as InferType<Q>;
 

diff --git a/src/resolvers/zod/ValidAndFormat.ts b/src/resolvers/zod/ValidAndFormat.ts
@@ -26,49 +26,37 @@ export default class ValidAndFormat<
 		this.nativeRequest = nativeRequest;
 	}
 
-	headers(): TypeOf<H> | ReadonlyHeaders {
-		if (!this.Schemas?.headers) return Headers();
-
-		return this.Schemas.headers.parse(Headers());
-	}
-
-	context(): TypeOf<C> {
-		if (!this.Schemas?.context) return this.NativeContext;
-
-		return this.Schemas.context.parse(this.NativeContext);
-	}
-
-	private getQueryWhoNoHasSchema(
-		queriesArray: Array<keyof TypeOf<Q>>,
-	): Partial<TypeOf<Q>> {
-		//
-		const resQueries: any = {};
+	private getQueryWhoNoHasSchema() {
+		return (queriesArray: Array<keyof TypeOf<Q>>): Partial<TypeOf<Q>> => {
+			//
+			const resQueries: any = {};
 
-		const symbolsReq = Object.getOwnPropertySymbols(this.nativeRequest);
+			const symbolsReq = Object.getOwnPropertySymbols(this.nativeRequest);
 
-		const UrlNative = symbolsReq
-			.filter((S) => {
-				//@ts-ignore
-				const item = this.nativeRequest[S];
+			const UrlNative = symbolsReq
+				.filter((S) => {
+					//@ts-ignore
+					const item = this.nativeRequest[S];
 
-				return item?.url;
-			})
-			.map<URL>((S) => {
-				//@ts-ignore
-				const item = this.nativeRequest[S];
+					return item?.url;
+				})
+				.map<URL>((S) => {
+					//@ts-ignore
+					const item = this.nativeRequest[S];
 
-				return item?.url;
-			})[0];
+					return item?.url;
+				})[0];
 
-		const validUrlNative = Object.keys(this.nativeRequest).includes("url");
+			const validUrlNative = Object.keys(this.nativeRequest).includes("url");
 
-		const url = validUrlNative ? new URL(this.nativeRequest.url) : UrlNative;
+			const url = validUrlNative ? new URL(this.nativeRequest.url) : UrlNative;
 
-		queriesArray.map((q) => {
-			resQueries[q] = url.searchParams.get(String(q));
-		});
+			queriesArray.map((q) => {
+				resQueries[q] = url.searchParams.get(String(q));
+			});
 
-		return resQueries;
+			return resQueries;
+		};
 	}
 
 	private createGetQueryWhoHasSchema(queryFormat: TypeOf<Q>) {
@@ -85,12 +73,24 @@ export default class ValidAndFormat<
 		};
 	}
 
+	headers(): TypeOf<H> | ReadonlyHeaders {
+		if (!this.Schemas?.headers) return Headers();
+
+		return this.Schemas.headers.parse(Headers());
+	}
+
+	context(): TypeOf<C> {
+		if (!this.Schemas?.context) return this.NativeContext;
+
+		return this.Schemas.context.parse(this.NativeContext);
+	}
+
 	query() {
-		if (!this.Schemas?.query) return this.getQueryWhoNoHasSchema;
+		if (!this.Schemas?.query) return this.getQueryWhoNoHasSchema();
 
 		const keys = Object.keys(this.Schemas.query.shape);
 
-		const query = this.getQueryWhoNoHasSchema(keys);
+		const query = this.getQueryWhoNoHasSchema()(keys);
 
 		const queryFormat = this.Schemas.query.parse(query) as TypeOf<Q>;
 

diff --git a/src/resolvers/zod/types.ts b/src/resolvers/zod/types.ts
@@ -31,6 +31,7 @@ export type ZodResponseFactoryKeyJsonType = ReturnType<
 
 export type ZodHandlerReturn =
 	| void
+	| Response
 	| ReturnType<ReturnType<ZodResponseFactoryType>["json"]>
 	| ReturnType<ReturnType<ZodResponseFactoryType>["redirect"]>
 	| ReturnType<ReturnType<ZodResponseFactoryType>["rewrite"]>
@@ -73,7 +74,7 @@ export interface IZodRouteParams<
 		req: IZodRequestFactoryResp<B, C, Q>,
 		reply: ReturnType<typeof responseFactory>,
 		context: TypeOf<C>,
-	) => ZodHandlerReturn | Promise<ZodHandlerReturn>;
+	) => ZodHandlerReturn;
 }
 
 export type ZodRouteType = typeof zodRoute;