fixed type issues and updated test cases

Author: dev-saad07

src/index.ts

@@ -1,6 +1,7 @@
 import { version } from "../package.json";
 import errorMessages from "./constants/errorMessages";
 import { ImageKitOptions, UploadOptions, UploadResponse, UrlOptions } from "./interfaces";
+import IKResponse from "./interfaces/IKResponse";
 import { upload } from "./upload/index";
 import { url } from "./url/index";
 import transformationUtils from "./utils/transformation";
@@ -83,9 +84,9 @@ class ImageKit {
    *
    * @param uploadOptions
    */
-  upload(uploadOptions: UploadOptions, options?: Partial<ImageKitOptions>): Promise<UploadResponse>
-  upload(uploadOptions: UploadOptions, callback: (err: Error | null, response: UploadResponse | null) => void, options?: Partial<ImageKitOptions>): XMLHttpRequest;
-  upload(uploadOptions: UploadOptions, callbackOrOptions?: ((err: Error | null, response: UploadResponse | null) => void) | Partial<ImageKitOptions>, options?: Partial<ImageKitOptions>): XMLHttpRequest | Promise<UploadResponse> {
+  upload(uploadOptions: UploadOptions, options?: Partial<ImageKitOptions>): Promise<IKResponse<UploadResponse>>
+  upload(uploadOptions: UploadOptions, callback: (err: Error | null, response: IKResponse<UploadResponse> | null) => void, options?: Partial<ImageKitOptions>): XMLHttpRequest;
+  upload(uploadOptions: UploadOptions, callbackOrOptions?: ((err: Error | null, response: IKResponse<UploadResponse> | null) => void) | Partial<ImageKitOptions>, options?: Partial<ImageKitOptions>): XMLHttpRequest | Promise<IKResponse<UploadResponse>> {
     let callback;
     if (typeof callbackOrOptions === 'function') {
       callback = callbackOrOptions;
@@ -97,7 +98,7 @@ class ImageKit {
       ...options,
     };
     const xhr = new XMLHttpRequest();
-    const promise = promisify<UploadResponse>(this, upload)(xhr, uploadOptions, mergedOptions, callback);
+    const promise = promisify<IKResponse<UploadResponse>>(this, upload)(xhr, uploadOptions, mergedOptions, callback);
     if (typeof promise === "object" && typeof promise.then === "function") {
       return promise
     } else {

src/interfaces/UploadOptions.ts

@@ -97,5 +97,5 @@ export interface UploadOptions {
    * Stringified JSON key-value data to be associated with the asset. Checkout overwriteCustomMetadata parameter to understand default behaviour.
    * Before setting any custom metadata on an asset you have to create the field using custom metadata fields API.
    */
-  customMetadata?: Record<string, string | number | boolean>
+  customMetadata?: string | Record<string, string | number | boolean | Array<string | number | boolean>>
 }

src/interfaces/UploadResponse.ts

@@ -159,8 +159,4 @@ export interface UploadResponse {
    * Field object which will contain the status of each extension at the time of completion of the update/upload request.
    */ 
   extensionStatus?: { [key: string]: string }
-  /*
-   * Metadata for the response containing headers and status
-   */
-  $ResponseMetadata?: object
 }

src/upload/index.ts

@@ -50,6 +50,9 @@ export const upload = (
       else if(Array.isArray(param)) {
         formData.append(i, JSON.stringify(param));
       }
+      else if(typeof param === "object" && !(param instanceof File || param instanceof Blob)) {
+        formData.append(i, JSON.stringify(param));
+      }
       else {
         formData.append(i, param);
       }

src/utils/request.ts

@@ -11,13 +11,16 @@ interface SignatureResponse {
 
 function getResponseHeaderMap(xhr: XMLHttpRequest) {
     const headers: Record<string, string | number | boolean> = {};
-    xhr.getAllResponseHeaders()
+    const responseHeaders = xhr.getAllResponseHeaders();
+    if (Object.keys(responseHeaders).length) {
+        responseHeaders
         .trim()
         .split(/[\r\n]+/)
         .map(value => value.split(/: /))
         .forEach(keyValue => {
           headers[keyValue[0].trim()] = keyValue[1].trim();
         });
+    }
     return headers;
 }
 

test/upload.js

@@ -444,7 +444,8 @@ describe("File upload", function () {
         successUploadResponse();
 
         var arg = server.requests[0].requestBody;
-        expect(arg.get('file').size).to.be.eq(buffer.length);
+
+        expect(JSON.parse(arg.get('file')).data.length).to.be.eq(buffer.length);
         expect(arg.get('fileName')).to.be.equal("test_file_name");
         expect(arg.get('token')).to.be.equal("test_token");
         expect(arg.get('expire')).to.be.equal("123");