feat(deps): upgrade dependencies to latest minor version.

yaacovCR · Jun 28, 2019 · 850f513 · 850f513
1 parent 1541a9f
commit 850f513
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -51,38 +51,38 @@
   },
   "homepage": "https://github.com/yaacovCR/graphql-tools-fork#readme",
   "dependencies": {
-    "apollo-link": "^1.2.3",
-    "apollo-utilities": "^1.0.1",
+    "apollo-link": "^1.2.12",
+    "apollo-utilities": "^1.3.2",
     "deprecated-decorator": "^0.1.6",
-    "iterall": "^1.1.3",
-    "uuid": "^3.1.0"
+    "iterall": "^1.2.2",
+    "uuid": "^3.3.2"
   },
   "peerDependencies": {
-    "graphql": "^0.13.0 || ^14.0.0"
+    "graphql": "^14.4.0"
   },
   "devDependencies": {
-    "@types/chai": "4.0.10",
-    "@types/dateformat": "^1.0.1",
-    "@types/graphql": "14.0.0",
-    "@types/mocha": "^2.2.44",
-    "@types/node": "^8.0.47",
-    "@types/uuid": "^3.4.3",
-    "@types/zen-observable": "^0.5.3",
-    "body-parser": "^1.18.2",
-    "chai": "^4.1.2",
+    "@types/chai": "4.1.7",
+    "@types/dateformat": "^3.0.0",
+    "@types/graphql": "14.2.2",
+    "@types/mocha": "^5.2.7",
+    "@types/node": "^12.0.10",
+    "@types/uuid": "^3.4.4",
+    "@types/zen-observable": "^0.8.0",
+    "body-parser": "^1.19.0",
+    "chai": "^4.2.0",
     "dateformat": "^3.0.3",
-    "express": "^4.16.2",
+    "express": "^4.17.1",
     "graphql": "^14.0.2",
-    "graphql-subscriptions": "^1.0.0",
-    "graphql-type-json": "^0.1.4",
+    "graphql-subscriptions": "^1.1.0",
+    "graphql-type-json": "^0.3.0",
     "istanbul": "^0.4.5",
-    "mocha": "^4.0.1",
-    "prettier": "^1.7.4",
-    "remap-istanbul": "0.9.6",
-    "rimraf": "^2.6.2",
-    "source-map-support": "^0.5.0",
+    "mocha": "^6.1.4",
+    "prettier": "^1.18.2",
+    "remap-istanbul": "0.13.0",
+    "rimraf": "^2.6.3",
+    "source-map-support": "^0.5.12",
     "standard-version": "^6.0.1",
-    "tslint": "^5.8.0",
-    "typescript": "3.0.3"
+    "tslint": "^5.18.0",
+    "typescript": "3.5.2"
   }
 }
diff --git a/src/generate/concatenateTypeDefs.ts b/src/generate/concatenateTypeDefs.ts
@@ -9,10 +9,6 @@ function concatenateTypeDefs(
 ): string {
   let resolvedTypeDefinitions: string[] = [];
   typeDefinitionsAry.forEach((typeDef: ITypedef) => {
-    if ((<DocumentNode>typeDef).kind !== undefined) {
-      typeDef = print(typeDef);
-    }
-
     if (typeof typeDef === 'function') {
       if (calledFunctionRefs.indexOf(typeDef) === -1) {
         calledFunctionRefs.push(typeDef);
@@ -22,6 +18,8 @@ function concatenateTypeDefs(
       }
     } else if (typeof typeDef === 'string') {
       resolvedTypeDefinitions.push(typeDef.trim());
+    } else if ((<DocumentNode>typeDef).kind !== undefined) {
+      resolvedTypeDefinitions.push(print(typeDef).trim());
     } else {
       const type = typeof typeDef;
       throw new SchemaError(

diff --git a/src/stitching/makeRemoteExecutableSchema.ts b/src/stitching/makeRemoteExecutableSchema.ts
@@ -124,7 +124,7 @@ export default function makeRemoteExecutableSchema({
   for (const type of types) {
     if (type instanceof GraphQLInterfaceType || type instanceof GraphQLUnionType) {
       resolvers[type.name] = {
-        __resolveType(parent, context, info) {
+        __resolveType(parent: any, context: any, info: GraphQLResolveInfo) {
           return resolveParentFromTypename(parent, info.schema);
         }
       };

diff --git a/src/test/testSchemaGenerator.ts b/src/test/testSchemaGenerator.ts
@@ -14,7 +14,7 @@ import {
   GraphQLEnumType,
 } from 'graphql';
 // import { printSchema } from 'graphql';
-const GraphQLJSON = require('graphql-type-json');
+const { GraphQLJSON } = require('graphql-type-json');
 import { Logger } from '../Logger';
 import TypeA from './circularSchemaA';
 import {

diff --git a/src/test/testingSchemas.ts b/src/test/testingSchemas.ts
@@ -8,6 +8,8 @@ import {
   ValueNode,
   ExecutionResult,
   DocumentNode,
+  Source,
+  GraphQLResolveInfo,
 } from 'graphql';
 import { ExecutionResultDataDefault } from 'graphql/execution/execute';
 import {
@@ -386,7 +388,7 @@ const propertyResolvers: IResolvers = {
   JSON: GraphQLJSON,
 
   TestInterface: {
-    __resolveType(obj) {
+    __resolveType(obj: any) {
       if (obj.kind === 'ONE') {
         return 'TestImpl1';
       } else {
@@ -396,7 +398,7 @@ const propertyResolvers: IResolvers = {
   },
 
   TestUnion: {
-    __resolveType(obj) {
+    __resolveType(obj: any) {
       if (obj.kind === 'ONE') {
         return 'TestImpl1';
       } else {
@@ -459,7 +461,7 @@ const productResolvers: IResolvers = {
   },
 
   Product: {
-    __resolveType(obj) {
+    __resolveType(obj: any) {
       if (obj.type === 'simple') {
         return 'SimpleProduct';
       } else {
@@ -589,7 +591,7 @@ const bookingResolvers: IResolvers = {
   },
 
   Booking: {
-    __isTypeOf(source, context, info) {
+    __isTypeOf(source: Source, context: any, info: GraphQLResolveInfo) {
       return Object.prototype.hasOwnProperty.call(source, 'id');
     },
     customer(parent: Booking) {
@@ -623,7 +625,7 @@ const bookingResolvers: IResolvers = {
   },
 
   Vehicle: {
-    __resolveType(parent) {
+    __resolveType(parent: any) {
       if (parent.licensePlate) {
         return 'Car';
       } else if (parent.bikeType) {