fix(core): Files leak

Author: maticzav

ava.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  compileEnhancements: false,
+  extensions: ['ts'],
+  require: ['ts-node/register'],
+  files: ['src/test'],
+}

package.json

@@ -32,6 +32,7 @@
     "prettier": "1.13.7",
     "prettier-check": "2.0.0",
     "semantic-release": "15.5.2",
+    "ts-node": "^7.0.0",
     "tslint": "5.10.0",
     "tslint-config-prettier": "1.13.0",
     "tslint-config-standard": "7.0.0",

src/index.ts

@@ -207,13 +207,19 @@ export function processor<T>(uploadHandler: IUploadHandler<T>) {
     upload,
   }: IUploadArgument): Maybe<Promise<IProcessedUploadArgument<T>>> {
     if (Array.isArray(upload)) {
-      const uploads = upload.map(file => file.then(uploadHandler))
+      const uploads = upload.reduce((acc, file) => {
+        if (file !== undefined && file !== null && file.then) {
+          return [...acc, file.then(uploadHandler)]
+        } else {
+          return acc
+        }
+      }, [])
 
       return Promise.all(uploads).then(res => ({
         argumentName: argumentName,
         upload: res,
       }))
-    } else if (upload !== undefined && upload !== null) {
+    } else if (upload !== undefined && upload !== null && upload.then) {
       return upload.then(uploadHandler).then(res => ({
         argumentName: argumentName,
         upload: res,
@@ -241,8 +247,8 @@ export function processor<T>(uploadHandler: IUploadHandler<T>) {
  */
 export function upload<T>({ uploadHandler }: IConfig<T>): IMiddlewareFunction {
   return async (resolve, parent, args, ctx, info) => {
-    const files = extractUploadArguments(args, info)
-    const uploads = filterMap(processor(uploadHandler), files)
+    const uploadArguments = extractUploadArguments(args, info)
+    const uploads = filterMap(processor(uploadHandler), uploadArguments)
 
     const uploaded = await Promise.all(uploads)
     const argsUploaded = normaliseArguments(uploaded)

test.js renamed to src/test/index.test.ts

@@ -2,14 +2,15 @@ import test from 'ava'
 import { makeExecutableSchema } from 'graphql-tools'
 import { applyMiddleware } from 'graphql-middleware'
 import { GraphQLUpload } from 'apollo-upload-server'
-import { graphql, GraphQLString, GraphQLInteger } from 'graphql'
+import { graphql, GraphQLString } from 'graphql'
 import {
   filterMapFieldArguments,
   isGraphQLArgumentType,
   uploadTypeIdentifier,
   normaliseArguments,
   processor as uploadPorcessor,
-} from './'
+  IUpload,
+} from '../'
 
 // Helpers
 
@@ -468,7 +469,7 @@ test('Processor handles multiple files correctly', async t => {
       ),
     )
 
-  const file = x =>
+  const file = (x): Promise<IUpload> =>
     new Promise(resolve =>
       resolve({
         stream: `s${x}`,
@@ -489,6 +490,36 @@ test('Processor handles multiple files correctly', async t => {
   })
 })
 
+test('Processor handles empty files correctly', async t => {
+  const uploadHandler = ({ stream, filename, mimetype, encoding }) =>
+    new Promise(resolve =>
+      setTimeout(
+        () => resolve(`${stream}${filename}${mimetype}${encoding}`),
+        10,
+      ),
+    )
+
+  const file = (x): Promise<IUpload> =>
+    new Promise(resolve =>
+      resolve({
+        stream: `s${x}`,
+        filename: `f${x}`,
+        mimetype: `m${x}`,
+        encoding: `e${x}`,
+      }),
+    )
+
+  const res = await uploadPorcessor(uploadHandler)({
+    argumentName: 'test',
+    upload: [file(1), null, undefined],
+  })
+
+  t.deepEqual(res, {
+    argumentName: 'test',
+    upload: ['s1f1m1e1'],
+  })
+})
+
 test('Processor handles no file correctly', async t => {
   const uploadHandler = ({ stream, filename, mimetype, encoding }) =>
     new Promise(resolve =>

yarn.lock

@@ -852,7 +852,7 @@ buf-compare@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
 
-buffer-from@^1.0.0:
+buffer-from@^1.0.0, buffer-from@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
 
@@ -1419,7 +1419,7 @@ [email protected]:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
 
-diff@^3.2.0:
+diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -2705,6 +2705,10 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+make-error@^1.1.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -3882,7 +3886,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.0:
+source-map-support@^0.5.0, source-map-support@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
   dependencies:
@@ -4187,6 +4191,19 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+ts-node@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.0.tgz#a94a13c75e5e1aa6b82814b84c68deb339ba7bff"
+  dependencies:
+    arrify "^1.0.0"
+    buffer-from "^1.1.0"
+    diff "^3.1.0"
+    make-error "^1.1.1"
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.5.6"
+    yn "^2.0.0"
+
 tslib@^1.0.0, tslib@^1.8.0, tslib@^1.8.1:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
@@ -4498,6 +4515,10 @@ yargs@~3.10.0:
     decamelize "^1.0.0"
     window-size "0.1.0"
 
+yn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
+
 zen-observable-ts@^0.8.6, zen-observable-ts@^0.8.9:
   version "0.8.9"
   resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz#d3c97af08c0afdca37ebcadf7cc3ee96bda9bab1"