Properly print list scalar input types (closes #93)

codegen/src/printers.ts

@@ -0,0 +1,27 @@
+import {
+  GraphQLInputType,
+  GraphQLScalarType,
+  GraphQLEnumType,
+  GraphQLInputObjectType,
+} from "graphql";
+
+import { inputType, listType, toPrimitive } from "./utils";
+
+export const printInputType = (type: GraphQLInputType): string => {
+  const isList = listType(type);
+  const base = inputType(type);
+
+  return (
+    (() => {
+      if (base instanceof GraphQLScalarType) {
+        return toPrimitive(base);
+      } else if (base instanceof GraphQLEnumType) {
+        return base.name;
+      } else if (base instanceof GraphQLInputObjectType) {
+        return "I" + base.name;
+      } else {
+        throw new Error("Unable to render inputType.");
+      }
+    })() + (isList ? "[]" : "")
+  );
+};

codegen/src/transforms/selectors.ts

@@ -3,32 +3,20 @@ import {
   ASTVisitor,
   Kind,
   GraphQLArgument,
-  isListType,
-  isNonNullType,
   GraphQLField,
   GraphQLObjectType,
-  GraphQLInputObjectType,
-  GraphQLInputType,
-  GraphQLOutputType,
   GraphQLNonNull,
-  GraphQLList,
   GraphQLScalarType,
   GraphQLEnumType,
-  GraphQLNamedType,
   GraphQLUnionType,
   GraphQLInterfaceType,
   DocumentNode,
 } from "graphql";
 import { imp, code } from "ts-poet";
 import { invariant } from "outvariant";
 
-import {
-  inputType,
-  outputType,
-  listType,
-  toPrimitive,
-  toLower,
-} from "../utils";
+import { printInputType } from "../printers";
+import { inputType, outputType, toPrimitive, toLower } from "../utils";
 
 const printConditionalNamedType = (types: string[]) => {
   const [first, ...rest] = types;
@@ -57,20 +45,6 @@ const printConditionalSelectorArg = (types: string[]) => {
   }
 };
 
-const printInputType = (type: GraphQLInputType): string => {
-  const _base = inputType(type);
-
-  if (_base instanceof GraphQLScalarType) {
-    return toPrimitive(_base);
-  } else if (_base instanceof GraphQLEnumType) {
-    return _base.name;
-  } else if (_base instanceof GraphQLInputObjectType) {
-    return "I" + _base.name;
-  } else {
-    throw new Error("Unable to render inputType.");
-  }
-};
-
 const printArgument = (arg: GraphQLArgument): string => {
   const type = inputType(arg.type);
   const typename =

codegen/src/transforms/types.ts

@@ -3,18 +3,14 @@ import {
   ASTVisitor,
   Kind,
   GraphQLArgument,
-  isListType,
   isNonNullType,
   GraphQLField,
   GraphQLObjectType,
   GraphQLInputObjectType,
   GraphQLInputType,
-  GraphQLOutputType,
   GraphQLNonNull,
-  GraphQLList,
   GraphQLScalarType,
   GraphQLEnumType,
-  GraphQLNamedType,
   GraphQLUnionType,
   GraphQLInterfaceType,
   DocumentNode,
@@ -23,30 +19,17 @@ import {
 import { code } from "ts-poet";
 import { invariant } from "outvariant";
 
+import { printInputType } from "../printers";
 import { inputType, outputType, listType, toPrimitive } from "../utils";
 
-const printInputType = (type: GraphQLInputType): string => {
-  const _base = inputType(type);
-
-  if (_base instanceof GraphQLScalarType) {
-    return toPrimitive(_base);
-  } else if (_base instanceof GraphQLEnumType) {
-    return _base.name;
-  } else if (_base instanceof GraphQLInputObjectType) {
-    return "I" + _base.name;
-  } else {
-    throw new Error("Unable to render inputType.");
-  }
-};
-
 const printVariable = (arg: GraphQLArgument): string => {
   return `${arg.name}: ${printInputType(arg.type)} ${
     arg.type instanceof GraphQLNonNull ? "" : "| undefined"
   }`;
 };
 
 const printField = (field: GraphQLField<any, any, any>): string => {
-  const { name, args } = field;
+  const { args } = field;
 
   const isList = listType(field.type);
   const isNonNull = field.type instanceof GraphQLNonNull;
@@ -129,7 +112,7 @@ export const transform = (
       const fields = Object.values(type.getFields());
 
       const printField = (field: GraphQLInputField) => {
-        const isList = isListType(field.type);
+        const isList = listType(field.type);
         const isNonNull = isNonNullType(field.type);
         const baseType = inputType(field.type);
 

codegen/src/utils.ts

@@ -36,7 +36,7 @@ export function outputType(type: GraphQLOutputType): GraphQLOutputType {
   }
 }
 
-export function listType(type: GraphQLOutputType): boolean {
+export function listType(type: GraphQLOutputType | GraphQLInputType): boolean {
   if (type instanceof GraphQLNonNull) {
     return listType(type.ofType);
   } else if (type instanceof GraphQLList) {