From 230b98aff3233840770612ce7739e58a3a0a4391 Mon Sep 17 00:00:00 2001
From: Simon Erslev Milfred <smi@limbo.works>
Date: Tue, 14 Nov 2023 13:31:13 +0100
Subject: [PATCH] feat: made form fetchable through exposed values

---
 .playground/app.vue      |  9 +++++++++
 components/FetchForm.vue | 30 ++++++++++++++++++++++--------
 package.json             |  2 +-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.playground/app.vue b/.playground/app.vue
index 430d9d9..98a604e 100644
--- a/.playground/app.vue
+++ b/.playground/app.vue
@@ -1,6 +1,7 @@
 <template>
 	<div>
 		<FetchForm
+			ref="form"
 			:action="`https://pokeapi.co/api/v2/pokemon/${pokemon.toLowerCase()}`"
 			#default="{ isFetching, currentResponse, currentError }"
 			:mockup-response="(payload) => ({ name: 'ditto', payload })"
@@ -21,6 +22,14 @@
 const pokemon = ref('ditto');
 const data = ref(null);
 
+const form = ref(null);
+onMounted(async () => {
+	console.log(form.value);
+	if (!form.value.isFetching) {
+		console.log(await form.value.fetch());
+	}
+});
+
 const onResponse = (response) => {
 	data.value = response;
 };
diff --git a/components/FetchForm.vue b/components/FetchForm.vue
index 2b1f49d..75e16f3 100644
--- a/components/FetchForm.vue
+++ b/components/FetchForm.vue
@@ -1,5 +1,6 @@
 <template>
 	<form
+		ref="$el"
 		:onsubmit="isMounted ? null : 'return false;'"
 		:action="action"
 		:enctype="enctype"
@@ -47,6 +48,7 @@ const props = defineProps({
 
 const emit = defineEmits(['fetch', 'request', 'response', 'response:full', 'error', 'complete']);
 
+const $el = ref(null);
 const isMounted = ref(false);
 const method = computed(() => (props.method || 'GET').toUpperCase());
 const options = computed(() => {
@@ -60,7 +62,8 @@ const options = computed(() => {
 	};
 });
 
-const isFetching = ref(false);
+const isFetchingCount = ref(0);
+const isFetching = computed(() => isFetchingCount.value > 0);
 const currentResponse = ref(null);
 const currentError = ref(null);
 
@@ -74,7 +77,7 @@ onMounted(() => {
 	isMounted.value = true;
 });
 
-function onSubmit(e) {
+async function onSubmit(e) {
 	if (props.disabled) {
 		e.preventDefault();
 		return;
@@ -92,10 +95,14 @@ function onSubmit(e) {
 	// Prevent ordinary form handling
 	e.preventDefault();
 
-	// Run fetch
+    // Run fetch
+    await fetch(true);
+}
+
+async function fetch() {
 	if (props.action) {
 		const actionURL = new URL(props.action, 'https://example.com');
-		let formData = e.target.formData ? e.target.formData() : new FormData(e.target);
+		let formData = $el.value?.formData ? $el.value.formData() : new FormData($el.value);
 		let origin = actionURL.origin === 'https://example.com' ? '' : actionURL.origin;
 
 		// Transform the data
@@ -120,7 +127,7 @@ function onSubmit(e) {
 		}
 
 		let success = true;
-		isFetching.value = true;
+		isFetchingCount.value++;
 
         // Get mockup response
         if (props.mockupResponse) {
@@ -134,10 +141,10 @@ function onSubmit(e) {
 
 				currentResponse.value = props.mockupResponse;
 				currentError.value = null;
-				isFetching.value = false;
+				isFetchingCount.value--;
 			}));
 
-            return;
+            return data;
         }
 
 		const fetch = useFetch(origin + actionURL.pathname + actionURL.search, {
@@ -166,14 +173,21 @@ function onSubmit(e) {
 			currentError.value = error;
 		}).finally(() => {
 			// @complete
-			isFetching.value = false;
+			isFetchingCount.value--;
 			emit('complete', success);
 		});
 
 		// @fetch
 		emit('fetch', fetch);
+
+        // Await for returning data
+        await fetch;
+		return currentResponse.value;
 	}
 }
+
+// Expose fetch function
+defineExpose({ isFetching: isFetching.value, fetch });
 </script>
 
 <script>
diff --git a/package.json b/package.json
index fe40b08..7d829ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@limbo-works/fetch-form",
 	"type": "module",
-	"version": "0.1.1",
+	"version": "1.0.0",
 	"main": "./nuxt.config.js",
 	"scripts": {
 		"dev": "nuxi dev .playground",