fix: fileFilter not receiving all params

packages/core/shared/src/types.js

@@ -90,7 +90,7 @@ export type Batch = {
     additionalInfo: ?string,
 };
 
-export type FileFilterMethod = (File | string) => boolean | Promise<boolean>;
+export type FileFilterMethod = (File | string, number, FileLike[] | string[]) => boolean | Promise<boolean>;
 
 export type UploadOptions = {|
 	//automatically upload files when they are added (default: true)

packages/core/uploader/src/batch.js

@@ -17,19 +17,26 @@ let bCounter = 0;
 const processFiles = (batchId, files: UploadInfo, isPending: boolean, fileFilter: ?FileFilterMethod): Promise<BatchItem[]> => {
     const filterFn = fileFilter || DEFAULT_FILTER;
 
+    //we need a simple array of (file, url) to pass to filter fn if its provided (files can be recycled batch items)
+    const all: any[] = fileFilter ? Array.prototype
+        //$FlowExpectedError[method-unbinding] flow 0.153 !!!
+        .map.call(files, (f) => getIsBatchItem(f) ? (f.file || f.url) : f) :
+        //in case no filter fn, no need to map it
+        [];
+
     return Promise.all(Array.prototype
         //$FlowExpectedError[method-unbinding] flow 0.153 !!!
-        .map.call(files, (f) => {
-            const isBatchItem = getIsBatchItem(f);
-            const filterResult = filterFn(isBatchItem ? (f.file || f.url) : f);
+        .map.call(files, (f, index) => {
+            const filterResult = filterFn(all[index], index, all);
 
             return isPromise(filterResult) ?
                 filterResult.then((result) => !!result && f) :
                 (!!filterResult && f);
         }))
-        .then((filtered) => filtered
-            .filter(Boolean)
-            .map((f) => createBatchItem(f, batchId, isPending)));
+        .then((filtered) =>
+            filtered
+                .filter(Boolean)
+                .map((f) => createBatchItem(f, batchId, isPending)));
 };
 
 const createBatch = (files: UploadInfo | UploadInfo[], uploaderId: string, options: UploaderCreateOptions): Promise<Batch> => {

packages/core/uploader/src/defaults.js

@@ -3,7 +3,7 @@ import { devFreeze } from "@rpldy/shared";
 
 export const DEFAULT_PARAM_NAME = "file";
 
-export const DEFAULT_FILTER = (input: any): boolean => true;
+export const DEFAULT_FILTER = (input: any, i: number, arr: any[]): boolean => true;
 
 export const DEFAULT_OPTIONS: Object = devFreeze({
     autoUpload: true,

packages/core/uploader/src/tests/batch.test.js

@@ -137,7 +137,21 @@ describe("Batch tests", () => {
 
         expect(batch.items).toHaveLength(2);
 
-        expect(fileFilter).toHaveBeenNthCalledWith(1, files[0].file);
-        expect(fileFilter).toHaveBeenNthCalledWith(2, files[1].url);
+        expect(fileFilter).toHaveBeenNthCalledWith(1, files[0].file, 0, [files[0].file, files[1].url]);
+        expect(fileFilter).toHaveBeenNthCalledWith(2, files[1].url, 1, [files[0].file, files[1].url]);
+    });
+
+    it("should filter to only the first two items", async () => {
+        const files = [ {name: "test"}, "123", "456"];
+
+        createBatchItem
+            .mockReturnValueOnce("item1")
+            .mockReturnValueOnce("item2");
+
+        const batch = await createBatch(files, "u1", {
+            fileFilter: (_, index) => index < 2
+        });
+
+        expect(batch.items).toHaveLength(2);
     });
 });