fix(*): resolve fatal issue reconstructing args

+factor original/legacy Upload handler into separate file
+use more specific GraphQLNamedType than GraphQLType which
could include NotNull or List wrapper types
+add test of processTypeArgs function

Author: tgerk

.vscode/launch.json

@@ -1,16 +1,25 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "AVA",
-      "program": "${workspaceRoot}/node_modules/ava/profile.js",
-      "args": ["--serial", "${file}"],
-      "skipFiles": ["<node_internals>/**/*.js"]
-    }
-  ]
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {	"type": "node",
+            "request": "launch",
+            "name": "Run AVA test",
+            "program": "${workspaceRoot}/node_modules/ava/profile.js",
+            "args": [
+                "--serial",
+                "${file}"
+            ],
+            "skipFiles": [
+                "<node_internals>/**/*.js",
+                "node_modules/**/*.js"
+            ],
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/dist/**/*.js"
+            ],
+        },
+    ]
 }

package.json

@@ -18,10 +18,11 @@
     "lint": "tslint --project tsconfig.json {src}/**/*.ts && prettier-check --ignore-path .gitignore {src,.}/{*.ts,*.js}",
     "test": "npm run lint && npm run build && npm run test-ava",
     "test-ava": "ava --verbose",
-    "semantic-release": "semantic-release"
+    "semantic-release": "semantic-release",
+    "pretty": "npx prettier --write --ignore-path .gitignore {src,.}/{*.ts,*.js}"
   },
   "dependencies": {
-    "apollo-upload-server": "^5.0.0"
+    "graphql-middleware": "^1.4.2"
   },
   "devDependencies": {
     "@types/graphql": "0.13.4",
@@ -39,8 +40,8 @@
     "typescript": "2.9.2"
   },
   "peerDependencies": {
-    "graphql": "^0.13.2",
-    "graphql-middleware": "^1.4.2"
+    "apollo-upload-server": "^5.0.0",
+    "graphql": "^0.13.2"
   },
   "release": {
     "branch": "master"

src/index.ts

@@ -1,9 +1,8 @@
 import {
   GraphQLResolveInfo,
   GraphQLArgument,
-  GraphQLField,
   getNamedType,
-  GraphQLType,
+  GraphQLNamedType,
 } from 'graphql'
 import { IMiddlewareFunction } from 'graphql-middleware'
 
@@ -56,15 +55,17 @@ function getFieldArguments(info: GraphQLResolveInfo): GraphQLArgument[] {
  *
  */
 export function findArgumentsOfType(
-  type: string | GraphQLType,
+  type: string | GraphQLNamedType,
   info: GraphQLResolveInfo,
 ): Maybe<GraphQLArgument[]> {
   const fieldArguments = getFieldArguments(info)
   return filterMap((argDef: GraphQLArgument): Maybe<GraphQLArgument> => {
-    if (
-      getNamedType(argDef.type).name ===
-      (typeof type === 'string' ? type : getNamedType(type).name)
-    ) {
+    const argType = getNamedType(argDef.type)
+    if (typeof type === 'string') {
+      if (argType.name === type) {
+        return argDef
+      }
+    } else if (argType.name === type.name) {
       return argDef
     }
 
@@ -167,7 +168,7 @@ export declare type ITypeArgumentHandler<V, T> = (
 ) => Promise<T> // the field resolver expects arg of type T
 
 export interface IConfig<V, T> {
-  type: string | GraphQLType // name of type or type object describing V
+  type: string | GraphQLNamedType // name of type or type object describing V
   transform: ITypeArgumentHandler<V, T> // value transformation function
 }
 
@@ -200,7 +201,7 @@ export function processTypeArgs<V, T>({
           // substitute the transformed values into the args object
           .then(result =>
             result.reduce(
-              (args, [name, newValue]) => (args[name] = newValue),
+              (args, [name, newValue]) => { args[name] = newValue; return args },
               args,
             ),
           )
@@ -242,24 +243,4 @@ export function visitAllArgs({ visitor }): IMiddlewareFunction {
   }
 }
 
-// Preceding revision as a special case --------------------------------------
-
-// this object shape is defined by Apollo Upload Server v5.0.0
-export interface IUploadFile {
-  stream
-  filename
-  mimetype
-  encoding
-}
-
-declare type IUploadHandler<T> = (upload: IUploadFile) => Promise<T>
-
-export interface IUploadConfig<T> {
-  uploadHandler: IUploadHandler<T>
-}
-
-export function upload<T>({
-  uploadHandler,
-}: IUploadConfig<T>): IMiddlewareFunction {
-  return processTypeArgs({ type: 'Upload', transform: uploadHandler })
-}
+export * from './upload'

src/test/index.test.ts

@@ -2,20 +2,13 @@ import test from 'ava'
 import { makeExecutableSchema } from 'graphql-tools'
 import { applyMiddleware } from 'graphql-middleware'
 import { GraphQLUpload } from 'apollo-upload-server'
-import { graphql, GraphQLList, GraphQLString } from 'graphql'
+import { graphql, GraphQLList, GraphQLString, GraphQLScalarType } from 'graphql'
 import {
   findArgumentsOfType,
   getArgumentValue,
   makeArgumentTransform,
-} from '../'
-
-// this interface traces to busboy file handling, as used by Apollo Upload Server
-interface IUpload {
-  stream: string
-  filename: string
-  mimetype: string
-  encoding: string
-}
+  processTypeArgs,
+} from '../index'
 
 // Helpers
 
@@ -342,7 +335,7 @@ test('Processor handles multiple files correctly', async t => {
       ),
     )
 
-  const file = (x): Promise<IUpload> =>
+  const file = x =>
     new Promise(resolve =>
       resolve({
         stream: `s${x}`,
@@ -372,7 +365,7 @@ test('Processor handles empty files correctly', async t => {
       ),
     )
 
-  const file = (x): Promise<IUpload> =>
+  const file = x =>
     new Promise(resolve =>
       resolve({
         stream: `s${x}`,
@@ -411,3 +404,58 @@ test('Processor handles no file correctly', async t => {
 
   t.is(res, null)
 })
+
+test('processTypeArgs applies a transformations correctly', async t => {
+  // write a schema, an arg transform, and a query
+  t.plan(5)
+
+  let theValue = "some-random-string"
+
+  const typeDefs = `
+    scalar Custom
+
+    type Query {
+      test(pass: Custom): [String]!
+    }
+  `
+
+  const resolvers = {
+    Query: {
+      test: (parent, args, ctx, infp) => {
+        t.deepEqual(args, { pass: String('-'+theValue+'-').toUpperCase() })
+        return String(args.pass).split('-')
+      }
+    },
+    Custom: new GraphQLScalarType({
+      name: 'Custom',
+      serialize: x => x,
+      parseValue: x => x,
+      parseLiteral: x => {
+        t.is(x['value'], theValue); return `-${x['value']}-`
+      }
+    }),
+  }
+
+  const middleware = {
+    Query: {
+      test: processTypeArgs({ type: 'Custom', transform: x=> {
+        t.is(x, '-'+theValue+'-');
+        return Promise.resolve(String(x).toUpperCase())
+      }})
+    },
+  }
+
+  const schema = makeExecutableSchema({ typeDefs, resolvers })
+  const schemaWithMiddleware = applyMiddleware(schema, middleware)
+
+  const query = `
+    query {
+      test(pass: "${theValue}")
+    }
+  `
+
+  // Execution
+  const res = await graphql(schema, query)
+  console.log(res)
+  t.deepEqual(res.data.test, String('-'+theValue+'-').toUpperCase().split('-'))
+})

src/upload.ts

@@ -0,0 +1,23 @@
+import { GraphQLUpload } from 'apollo-upload-server'
+import { processTypeArgs } from './index'
+import { IMiddlewareFunction } from 'graphql-middleware'
+
+// this object shape is defined by Apollo Upload Server v5.0.0
+export interface IUploadFile {
+  stream
+  filename
+  mimetype
+  encoding
+}
+
+declare type IUploadHandler<T> = (upload: IUploadFile) => Promise<T>
+
+export interface IUploadConfig<T> {
+  uploadHandler: IUploadHandler<T>
+}
+
+export function upload<T>({
+  uploadHandler,
+}: IUploadConfig<T>): IMiddlewareFunction {
+  return processTypeArgs({ type: GraphQLUpload, transform: uploadHandler })
+}

tsconfig.json

@@ -7,7 +7,8 @@
     "outDir": "./dist",
     "sourceMap": true,
     "lib": ["dom", "es2017", "esnext.asynciterable"],
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "watch": true
   },
   "exclude": ["node_modules"]
 }

yarn.lock

@@ -43,12 +43,11 @@
     slide "^1.1.5"
 
 "@babel/runtime@^7.0.0-beta.40":
-  version "7.0.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.51.tgz#48b8ed18307034c6620f643514650ca2ccc0165a"
-  integrity sha1-SLjtGDBwNMZiD2Q1FGUMoszAFlo=
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"
+  integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==
   dependencies:
-    core-js "^2.5.7"
-    regenerator-runtime "^0.11.1"
+    regenerator-runtime "^0.12.0"
 
 "@concordance/react@^1.0.0":
   version "1.0.0"
@@ -1353,7 +1352,7 @@ core-assert@^0.2.0:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
-core-js@^2.0.0, core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
+core-js@^2.0.0, core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
   integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
@@ -3962,11 +3961,16 @@ regenerate@^1.2.1:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
+regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"