From 76b76e6f874ef37785167e0179f14e846f4986f9 Mon Sep 17 00:00:00 2001
From: Cretu Eusebiu <cretu.eusebiu@gmail.com>
Date: Fri, 30 Apr 2021 00:44:32 +0300
Subject: [PATCH] Handle files by default

---
 CHANGELOG.md    |  5 +++++
 docs.md         | 22 ++++++++-------------
 package.json    |  2 +-
 src/Form.ts     | 51 +++++++++++++++++++++++++++++++++++++++++++------
 src/util.ts     | 10 ++++++++++
 types/Form.d.ts | 13 +++++++++++++
 types/util.d.ts |  4 ++++
 7 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d87720..2291afb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.3 - 2021-04-30
+
+- Handle files with `FormData` by default.
+- Added upload `progress` property to `Form`.
+
 ## 2.0.2 - 2021-04-29
 
 - Fixed missing `Method` type for old axios versions.
diff --git a/docs.md b/docs.md
index 83a94ee..031a6d4 100644
--- a/docs.md
+++ b/docs.md
@@ -101,6 +101,11 @@ form.successful: boolean
  * The validation errors from the server.
  */
 form.errors: Errors
+
+/**
+ * The upload progress object.
+ */
+form.progress: { total: number, loaded: number, percentage: number } | undefined
 ```
 
 #### Instance methods
@@ -403,12 +408,6 @@ export default {
 
 ### File Upload
 
-To handle file uploads we need to install a npm pacakge:
-
-```bash
-npm install object-to-formdata
-```
-
 ```html
 <template>
 <form @submit.prevent="submit" @keydown="form.onKeydown($event)">
@@ -418,13 +417,14 @@ npm install object-to-formdata
   <input type="file" name="file" @change="handleFile">
   <HasError :form="form" field="file" />
 
+  <div v-if="form.progress">Progress: {{ form.progress.percentage }}%</div>
+
   <button type="submit">Submit</button>
 </form>
 </template>
 
 <script>
 import Form from 'vform'
-import { serialize } from 'object-to-formdata'
 import { HasError } from 'vform/src/components/bootstrap5'
 
 export default {
@@ -449,13 +449,7 @@ export default {
 
     async submit () {
       const response = await this.form.post('/upload', {
-        transformRequest: [serialize],
-
-        onUploadProgress: e => {
-          // Handle the progress...
-          // console.log(e)
-          // See: https://github.com/axios/axios#request-config
-        }
+        // onUploadProgress: e => console.log(e) }
       })
 
       // ...
diff --git a/package.json b/package.json
index 17c903d..9593004 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vform",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Handle Laravel-Vue forms and validation with ease.",
   "author": "Cretu Eusebiu",
   "license": "MIT",
diff --git a/src/Form.ts b/src/Form.ts
index 44b9b19..15eb374 100644
--- a/src/Form.ts
+++ b/src/Form.ts
@@ -1,6 +1,13 @@
+import { serialize } from 'object-to-formdata'
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios'
 import Errors from './Errors'
-import { deepCopy } from './util'
+import { deepCopy, hasFiles } from './util'
+
+interface Progress {
+  total: number
+  loaded: number
+  percentage: number
+}
 
 class Form {
   [key: string]: any
@@ -21,10 +28,15 @@ class Form {
    */
   errors: Errors = new Errors()
 
+  /**
+   * The upload progress object.
+   */
+  progress: Progress | undefined = undefined
+
   static axios: AxiosInstance
   static routes: Record<string, string> = {}
   static errorMessage = 'Something went wrong. Please try again.'
-  static ignore = ['busy', 'successful', 'errors', 'originalData']
+  static ignore = ['busy', 'successful', 'errors', 'progress', 'originalData']
 
   /**
    * Create a new form instance.
@@ -81,6 +93,7 @@ class Form {
     this.errors.clear()
     this.busy = true
     this.successful = false
+    this.progress = undefined
   }
 
   /**
@@ -89,6 +102,7 @@ class Form {
   finishProcessing () {
     this.busy = false
     this.successful = true
+    this.progress = undefined
   }
 
   /**
@@ -97,6 +111,7 @@ class Form {
   clear () {
     this.errors.clear()
     this.successful = false
+    this.progress = undefined
   }
 
   /**
@@ -151,15 +166,27 @@ class Form {
   submit (method: string, url: string, config: AxiosRequestConfig = {}): Promise<AxiosResponse> {
     this.startProcessing()
 
+    config = {
+      data: {},
+      params: {},
+      url: this.route(url),
+      method: method as any,
+      onUploadProgress: this.handleUploadProgress.bind(this),
+      ...config
+    }
+
     if (method.toLowerCase() === 'get') {
-      config.params = { ...this.data(), ...(config.params || {}) }
+      config.params = { ...this.data(), ...config.params }
     } else {
-      config.data = { ...this.data(), ...(config.data || {}) }
+      config.data = { ...this.data(), ...config.data }
+
+      if (hasFiles(config.data)) {
+        config.transformRequest = [data => serialize(data)]
+      }
     }
 
     return new Promise((resolve, reject) => {
-      // @ts-ignore
-      (Form.axios || axios).request({ url: this.route(url), method, ...config })
+      (Form.axios || axios).request(config)
         .then((response: AxiosResponse) => {
           this.finishProcessing()
           resolve(response)
@@ -176,6 +203,7 @@ class Form {
    */
   handleErrors (error: AxiosError) {
     this.busy = false
+    this.progress = undefined
 
     if (error.response) {
       this.errors.set(this.extractErrors(error.response))
@@ -201,6 +229,17 @@ class Form {
     return { ...response.data }
   }
 
+  /**
+   * Handle the upload progress.
+   */
+  handleUploadProgress (event: ProgressEvent) {
+    this.progress = {
+      total: event.total,
+      loaded: event.loaded,
+      percentage: Math.round((event.loaded * 100) / event.total)
+    }
+  }
+
   /**
    * @deprecated
    */
diff --git a/src/util.ts b/src/util.ts
index 7c504d1..1ebe5a2 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -21,3 +21,13 @@ export function deepCopy<T> (obj: T): T {
 export function arrayWrap<T> (value: T): T[] {
   return Array.isArray(value) ? value : [value]
 }
+
+/**
+ * Determine if the given data has files.
+ */
+export function hasFiles (data: File | Blob | FileList | Record<string, any>): boolean {
+  return data instanceof File ||
+    data instanceof Blob ||
+    data instanceof FileList ||
+    (typeof data === 'object' && data !== null && Object.values(data).find(value => hasFiles(value)) !== undefined)
+}
diff --git a/types/Form.d.ts b/types/Form.d.ts
index 10b66f5..e8b1f15 100644
--- a/types/Form.d.ts
+++ b/types/Form.d.ts
@@ -1,5 +1,10 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios';
 import Errors from './Errors';
+interface Progress {
+    total: number;
+    loaded: number;
+    percentage: number;
+}
 declare class Form {
     [key: string]: any;
     originalData: Record<string, any>;
@@ -15,6 +20,10 @@ declare class Form {
      * The validation errors from the server.
      */
     errors: Errors;
+    /**
+     * The upload progress object.
+     */
+    progress: Progress | undefined;
     static axios: AxiosInstance;
     static routes: Record<string, string>;
     static errorMessage: string;
@@ -91,6 +100,10 @@ declare class Form {
      * Extract the errors from the response object.
      */
     extractErrors(response: AxiosResponse): Record<string, any>;
+    /**
+     * Handle the upload progress.
+     */
+    handleUploadProgress(event: ProgressEvent): void;
     /**
      * @deprecated
      */
diff --git a/types/util.d.ts b/types/util.d.ts
index ab2e294..79f1da2 100644
--- a/types/util.d.ts
+++ b/types/util.d.ts
@@ -6,3 +6,7 @@ export declare function deepCopy<T>(obj: T): T;
  * If the given value is not an array, wrap it in one.
  */
 export declare function arrayWrap<T>(value: T): T[];
+/**
+ * Determine if the given data has files.
+ */
+export declare function hasFiles(data: File | Blob | FileList | Record<string, any>): boolean;