improve yup-action

adnanfajlur · Oct 9, 2024 · ecb4500 · ecb4500
1 parent 88fb7dd
commit ecb4500
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/app/utils/yup-action.ts b/app/utils/yup-action.ts
@@ -1,18 +1,33 @@
 import * as yup from 'yup'
 
+export async function yupAction<T extends yup.Schema>(
+	request: FormData,
+	schema: T,
+): Promise<yup.InferType<T>>
+
 export async function yupAction<T extends yup.Schema>(
 	request: Request,
 	schema: T,
-	type: 'form-data' | 'search-params',
-): Promise<yup.InferType<T>> {
+	type?: 'form-data' | 'search-params',
+): Promise<yup.InferType<T>>
+
+export async function yupAction<T extends yup.Schema>(
+	request: Request | FormData,
+	schema: T,
+	type?: 'form-data' | 'search-params',
+) {
 	let data: any = null
 
-	if (type === 'form-data') {
+	if (request instanceof FormData) {
+		data = Object.fromEntries(request)
+	}
+
+	if (type === 'form-data' && request instanceof Request) {
 		const formData = await request.formData()
 		data = Object.fromEntries(formData)
 	}
 
-	if (type === 'search-params') {
+	if (type === 'search-params' && request instanceof Request) {
 		const { searchParams } = new URL(request.url)
 		data = Object.fromEntries(searchParams)
 	}