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
apollographql · Oct 12, 2018 · ac39108 · ac39108
1 parent 11fc68a
commit ac39108
Show file tree

Hide file tree

Showing 23 changed files with 100 additions and 186 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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",

diff --git a/packages/apollo-codegen-core/package.json b/packages/apollo-codegen-core/package.json
@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

diff --git a/packages/apollo-codegen-core/src/utilities/graphql.ts b/packages/apollo-codegen-core/src/utilities/graphql.ts
@@ -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) {

diff --git a/packages/apollo-codegen-flow-legacy/package.json b/packages/apollo-codegen-flow-legacy/package.json
@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

diff --git a/packages/apollo-codegen-flow-legacy/src/codeGeneration.ts b/packages/apollo-codegen-flow-legacy/src/codeGeneration.ts
@@ -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,

diff --git a/packages/apollo-codegen-flow-legacy/src/types.ts b/packages/apollo-codegen-flow-legacy/src/types.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,

diff --git a/packages/apollo-codegen-flow/package.json b/packages/apollo-codegen-flow/package.json
@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

diff --git a/packages/apollo-codegen-flow/src/helpers.ts b/packages/apollo-codegen-flow/src/helpers.ts
@@ -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(

diff --git a/packages/apollo-codegen-scala/package.json b/packages/apollo-codegen-scala/package.json
@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

diff --git a/packages/apollo-codegen-scala/src/types.ts b/packages/apollo-codegen-scala/src/types.ts
@@ -4,11 +4,11 @@ import {
   GraphQLFloat,
   GraphQLBoolean,
   GraphQLID,
-  GraphQLList,
-  GraphQLNonNull,
   GraphQLScalarType,
   GraphQLEnumType,
-  isAbstractType
+  isAbstractType,
+  isNonNullType,
+  isListType
 } from "graphql";
 import { LegacyCompilerContext } from "apollo-codegen-core/lib/compiler/legacyIR";
 import { GraphQLType } from "graphql";
@@ -39,7 +39,7 @@ export function typeNameFromGraphQLType(
   isOptional?: boolean,
   isInputObject?: boolean
 ): string {
-  if (type instanceof GraphQLNonNull) {
+  if (isNonNullType(type)) {
     return typeNameFromGraphQLType(
       context,
       type.ofType,
@@ -51,7 +51,7 @@ export function typeNameFromGraphQLType(
   }
 
   let typeName;
-  if (type instanceof GraphQLList) {
+  if (isListType(type)) {
     typeName =
       "Seq[" +
       typeNameFromGraphQLType(context, type.ofType, bareTypeName) +

diff --git a/packages/apollo-codegen-swift/package.json b/packages/apollo-codegen-swift/package.json
@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {

diff --git a/packages/apollo-codegen-swift/src/codeGeneration.ts b/packages/apollo-codegen-swift/src/codeGeneration.ts
@@ -6,9 +6,9 @@ import {
   getNamedType,
   isCompositeType,
   GraphQLEnumType,
-  GraphQLList,
-  GraphQLNonNull,
-  GraphQLInputObjectType
+  GraphQLInputObjectType,
+  isNonNullType,
+  isListType
 } from "graphql";
 
 import {
@@ -221,9 +221,8 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
           const properties = variables.map(({ name, type }) => {
             const typeName = this.helpers.typeNameFromGraphQLType(type);
             const isOptional = !(
-              type instanceof GraphQLNonNull ||
-              (type instanceof GraphQLList &&
-                type.ofType instanceof GraphQLNonNull)
+              isNonNullType(type) ||
+              (isListType(type) && isNonNullType(type.ofType))
             );
             return { name, propertyName: name, type, typeName, isOptional };
           });

diff --git a/packages/apollo-codegen-swift/src/helpers.ts b/packages/apollo-codegen-swift/src/helpers.ts
@@ -5,13 +5,14 @@ import {
   GraphQLFloat,
   GraphQLBoolean,
   GraphQLID,
-  GraphQLList,
   GraphQLNonNull,
   GraphQLScalarType,
   GraphQLEnumType,
   isCompositeType,
   getNamedType,
-  GraphQLInputField
+  GraphQLInputField,
+  isNonNullType,
+  isListType
 } from "graphql";
 
 import { camelCase, pascalCase } from "change-case";
@@ -49,7 +50,7 @@ export class Helpers {
     unmodifiedTypeName?: string,
     isOptional?: boolean
   ): string {
-    if (type instanceof GraphQLNonNull) {
+    if (isNonNullType(type)) {
       return this.typeNameFromGraphQLType(
         type.ofType,
         unmodifiedTypeName,
@@ -60,7 +61,7 @@ export class Helpers {
     }
 
     let typeName;
-    if (type instanceof GraphQLList) {
+    if (isListType(type)) {
       typeName =
         "[" +
         this.typeNameFromGraphQLType(type.ofType, unmodifiedTypeName) +
@@ -84,9 +85,9 @@ export class Helpers {
   }
 
   fieldTypeEnum(type: GraphQLType, structName: string): string {
-    if (type instanceof GraphQLNonNull) {
+    if (isNonNullType(type)) {
       return `.nonNull(${this.fieldTypeEnum(type.ofType, structName)})`;
-    } else if (type instanceof GraphQLList) {
+    } else if (isListType(type)) {
       return `.list(${this.fieldTypeEnum(type.ofType, structName)})`;
     } else if (type instanceof GraphQLScalarType) {
       return `.scalar(${this.typeNameForScalarType(type)}.self)`;
@@ -146,7 +147,7 @@ export class Helpers {
 
     let type = field.type;
 
-    if (isConditional && type instanceof GraphQLNonNull) {
+    if (isConditional && isNonNullType(type)) {
       type = type.ofType;
     }
 
@@ -270,14 +271,14 @@ export class Helpers {
     outputTypeName: string
   ): string {
     let isOptional;
-    if (type instanceof GraphQLNonNull) {
+    if (isNonNullType(type)) {
       isOptional = !!isConditional;
       type = type.ofType;
     } else {
       isOptional = true;
     }
 
-    if (type instanceof GraphQLList) {
+    if (isListType(type)) {
       const elementType = type.ofType;
       if (isOptional) {
         return `${expression}.flatMap { ${makeClosureSignature(

diff --git a/packages/apollo-codegen-typescript-legacy/package.json b/packages/apollo-codegen-typescript-legacy/package.json
@@ -16,6 +16,7 @@
     "clean": "rm -rf lib",
     "prebuild": "npm run clean",
     "build": "tsc",
+    "watch": "tsc -w",
     "prepare": "npm run build"
   },
   "engines": {