Update graphql to version 14 (#624)

Update graphql package + types.
Resolve typescript errors and update snapshots.

Fixes #626

-- Amending commit for a new hash for testing purposes

Author: trevor-scheer

package-lock.json

@@ -50,7 +50,7 @@
     "@types/babel-types": "^7.0.4",
     "@types/chai": "^4.1.4",
     "@types/common-tags": "^1.4.0",
-    "@types/graphql": "^0.13.4",
+    "@types/graphql": "^14.0.2",
     "@types/inflected": "^1.1.29",
     "@types/jest": "^23.3.1",
     "@types/listr": "^0.13.0",
@@ -64,7 +64,7 @@
     "@types/ws": "^6.0.0",
     "chai": "^4.1.2",
     "fs-monkey": "^0.3.3",
-    "graphql": "^0.13.2",
+    "graphql": "^14.0.2",
     "husky": "^0.14.3",
     "jest": "^23.5.0",
     "jest-matcher-utils": "^23.5.0",

package.json

@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

packages/apollo-codegen-core/package.json

@@ -21,10 +21,10 @@ import {
   SelectionSetNode,
   FieldNode,
   GraphQLField,
-  GraphQLList,
-  GraphQLNonNull,
   DocumentNode,
-  DirectiveNode
+  DirectiveNode,
+  isListType,
+  isNonNullType
 } from "graphql";
 
 declare module "graphql/utilities/buildASTSchema" {
@@ -41,10 +41,7 @@ export function sortEnumValues(values: GraphQLEnumValue[]): GraphQLEnumValue[] {
 }
 
 export function isList(type: GraphQLType): boolean {
-  return (
-    type instanceof GraphQLList ||
-    (type instanceof GraphQLNonNull && type.ofType instanceof GraphQLList)
-  );
+  return isListType(type) || (isNonNullType(type) && isListType(type.ofType));
 }
 
 export function isMetaFieldName(name: string) {

packages/apollo-codegen-core/src/utilities/graphql.ts

@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

packages/apollo-codegen-flow-legacy/package.json

@@ -4,11 +4,12 @@ import {
   isCompositeType,
   isAbstractType,
   GraphQLEnumType,
-  GraphQLList,
   GraphQLNonNull,
   GraphQLInputObjectType,
   GraphQLObjectType,
-  GraphQLUnionType
+  GraphQLUnionType,
+  isListType,
+  isNonNullType
 } from "graphql";
 
 import { wrap } from "apollo-codegen-core/lib/utilities/printing";
@@ -187,10 +188,10 @@ export function interfaceVariablesDeclarationForOperation(
 }
 
 function getObjectTypeName(type: GraphQLType): string {
-  if (type instanceof GraphQLList) {
+  if (isListType(type)) {
     return getObjectTypeName(type.ofType);
   }
-  if (type instanceof GraphQLNonNull) {
+  if (isNonNullType(type)) {
     return getObjectTypeName(type.ofType);
   }
   if (type instanceof GraphQLObjectType) {
@@ -355,17 +356,12 @@ export function propertyFromField(
     const typeName = typeNameFromGraphQLType(context, fieldType);
     let isArray = false;
     let isArrayElementNullable = null;
-    if (fieldType instanceof GraphQLList) {
+    if (isListType(fieldType)) {
       isArray = true;
-      isArrayElementNullable = !(fieldType.ofType instanceof GraphQLNonNull);
-    } else if (
-      fieldType instanceof GraphQLNonNull &&
-      fieldType.ofType instanceof GraphQLList
-    ) {
+      isArrayElementNullable = !isNonNullType(fieldType.ofType);
+    } else if (isNonNullType(fieldType) && isListType(fieldType.ofType)) {
       isArray = true;
-      isArrayElementNullable = !(
-        fieldType.ofType.ofType instanceof GraphQLNonNull
-      );
+      isArrayElementNullable = !isNonNullType(fieldType.ofType.ofType);
     }
     return {
       ...property,

packages/apollo-codegen-flow-legacy/src/codeGeneration.ts

@@ -4,9 +4,9 @@ import {
   GraphQLFloat,
   GraphQLBoolean,
   GraphQLID,
-  GraphQLList,
-  GraphQLNonNull,
-  GraphQLScalarType
+  GraphQLScalarType,
+  isListType,
+  isNonNullType
 } from "graphql";
 import { LegacyCompilerContext } from "apollo-codegen-core/lib/compiler/legacyIR";
 import { GraphQLType } from "graphql";
@@ -25,12 +25,12 @@ export function typeNameFromGraphQLType(
   bareTypeName?: string | null,
   nullable = true
 ): string {
-  if (type instanceof GraphQLNonNull) {
+  if (isNonNullType(type)) {
     return typeNameFromGraphQLType(context, type.ofType, bareTypeName, false);
   }
 
   let typeName;
-  if (type instanceof GraphQLList) {
+  if (isListType(type)) {
     typeName = `Array< ${typeNameFromGraphQLType(
       context,
       type.ofType,

packages/apollo-codegen-flow-legacy/src/types.ts

@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

packages/apollo-codegen-flow/package.json

@@ -3,11 +3,11 @@ import {
   GraphQLFloat,
   GraphQLInt,
   GraphQLID,
-  GraphQLList,
-  GraphQLNonNull,
   GraphQLScalarType,
   GraphQLString,
-  GraphQLType
+  GraphQLType,
+  isListType,
+  isNonNullType
 } from "graphql";
 
 import * as t from "@babel/types";
@@ -37,7 +37,7 @@ export function createTypeAnnotationFromGraphQLTypeFunction(
     type: GraphQLType,
     typeName?: string
   ): t.FlowTypeAnnotation {
-    if (type instanceof GraphQLList) {
+    if (isListType(type)) {
       return t.genericTypeAnnotation(
         t.identifier(arrayType),
         t.typeParameterInstantiation([
@@ -58,7 +58,7 @@ export function createTypeAnnotationFromGraphQLTypeFunction(
       } else {
         return t.anyTypeAnnotation();
       }
-    } else if (type instanceof GraphQLNonNull) {
+    } else if (isNonNullType(type)) {
       // This won't happen; but for TypeScript completeness:
       return typeAnnotationFromGraphQLType(type.ofType, typeName);
     } else {
@@ -70,7 +70,7 @@ export function createTypeAnnotationFromGraphQLTypeFunction(
     type: GraphQLType,
     typeName?: string
   ): t.FlowTypeAnnotation {
-    if (type instanceof GraphQLNonNull) {
+    if (isNonNullType(type)) {
       return nonNullableTypeAnnotationFromGraphQLType(type.ofType, typeName);
     } else {
       return t.nullableTypeAnnotation(

packages/apollo-codegen-flow/src/helpers.ts

@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {