Gh 924

src/generate/addResolveFunctionsToSchema.ts

@@ -1,4 +1,4 @@
-import { SchemaError } from '.';
+import SchemaError from './SchemaError';
 
 import {
   GraphQLField,
@@ -17,7 +17,8 @@ import {
   IAddResolveFunctionsToSchemaOptions,
 } from '../Interfaces';
 import { applySchemaTransforms } from '../transforms/transforms';
-import { checkForResolveTypeResolver, extendResolversFromInterfaces } from '.';
+import checkForResolveTypeResolver from './checkForResolveTypeResolver';
+import extendResolversFromInterfaces from './extendResolversFromInterfaces';
 import ConvertEnumValues from '../transforms/ConvertEnumValues';
 
 function addResolveFunctionsToSchema(

src/generate/assertResolveFunctionsPresent.ts

@@ -6,7 +6,8 @@ import {
 } from 'graphql';
 import { IResolverValidationOptions } from '../Interfaces';
 
-import { forEachField, SchemaError } from '.';
+import SchemaError from './SchemaError';
+import forEachField from './forEachField';
 
 function assertResolveFunctionsPresent(
   schema: GraphQLSchema,

src/generate/attachConnectorsToContext.ts

@@ -4,7 +4,7 @@ import { deprecated } from 'deprecated-decorator';
 
 import { IConnectors, IConnector, IConnectorCls } from '../Interfaces';
 
-import { addSchemaLevelResolveFunction } from '.';
+import addSchemaLevelResolveFunction from './addSchemaLevelResolveFunction';
 
 // takes a GraphQL-JS schema and an object of connectors, then attaches
 // the connectors to the context by wrapping each query or mutation resolve

src/generate/buildSchemaFromTypeDefinitions.ts

@@ -7,11 +7,9 @@ import {
 } from 'graphql';
 import { ITypeDefinitions, GraphQLParseOptions } from '../Interfaces';
 
-import {
-  extractExtensionDefinitions,
-  concatenateTypeDefs,
-  SchemaError,
-} from '.';
+import SchemaError from './SchemaError';
+import extractExtensionDefinitions from './extractExtensionDefinitions';
+import concatenateTypeDefs from './concatenateTypeDefs';
 
 function buildSchemaFromTypeDefinitions(
   typeDefinitions: ITypeDefinitions,

src/generate/checkForResolveTypeResolver.ts

@@ -1,6 +1,6 @@
 import { GraphQLInterfaceType, GraphQLUnionType, GraphQLSchema } from 'graphql';
 
-import { SchemaError } from '.';
+import SchemaError from './SchemaError';
 
 // If we have any union or interface types throw if no there is no resolveType or isTypeOf resolvers
 function checkForResolveTypeResolver(

src/generate/concatenateTypeDefs.ts

@@ -1,7 +1,7 @@
 import { print, DocumentNode } from 'graphql';
 import { ITypedef } from '../Interfaces';
 
-import { SchemaError } from '.';
+import SchemaError from './SchemaError';
 
 function concatenateTypeDefs(
   typeDefinitionsAry: ITypedef[],

src/test/testMakeRemoteExecutableSchema.ts

@@ -32,15 +32,15 @@ describe('remote subscriptions', () => {
     `);
 
     let notificationCnt = 0;
-    subscribe(schema, subscription).then(results =>
+    subscribe(schema, subscription).then(results => {
       forAwaitEach(results as AsyncIterable<ExecutionResult>, (result: ExecutionResult) => {
         expect(result).to.have.property('data');
         expect(result.data).to.deep.equal(mockNotification);
         !notificationCnt++ ? done() : null;
-      }),
-    );
-
-    subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+      });
+    }).then(() => {
+      subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+    });
   });
 
   it('should work without triggering multiple times per notification', done => {
@@ -59,27 +59,29 @@ describe('remote subscriptions', () => {
     `);
 
     let notificationCnt = 0;
-    subscribe(schema, subscription).then(results =>
+    const sub1 = subscribe(schema, subscription).then(results => {
       forAwaitEach(results as AsyncIterable<ExecutionResult>, (result: ExecutionResult) => {
         expect(result).to.have.property('data');
         expect(result.data).to.deep.equal(mockNotification);
         notificationCnt++;
-      }),
-    );
+      });
+    });
 
-    subscribe(schema, subscription).then(results =>
+    const sub2 = subscribe(schema, subscription).then(results => {
       forAwaitEach(results as AsyncIterable<ExecutionResult>, (result: ExecutionResult) => {
         expect(result).to.have.property('data');
         expect(result.data).to.deep.equal(mockNotification);
-      }),
-    );
+      });
+    });
 
-    subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
-    subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+    Promise.all([sub1, sub2]).then(() => {
+      subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+      subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
 
-    setTimeout(() => {
-      expect(notificationCnt).to.eq(2);
-      done();
-    }, 0);
+      setTimeout(() => {
+        expect(notificationCnt).to.eq(2);
+        done();
+      }, 0);
+    });
   });
 });

src/test/testMergeSchemas.ts

@@ -736,10 +736,9 @@ bookingById(id: "b1") {
                 !notificationCnt++ ? done() : null;
               },
             ).catch(done);
-          })
-          .catch(done);
-
-        subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).then(() => {
+            subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).catch(done);
       });
 
       it('subscription errors are working correctly in merged schema', done => {
@@ -793,10 +792,9 @@ bookingById(id: "b1") {
                 !notificationCnt++ ? done() : null;
               },
             ).catch(done);
-          })
-          .catch(done);
-
-        subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).then(() => {
+            subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).catch(done);
       });
 
       it('links in queries', async () => {

src/test/testResolution.ts

@@ -119,11 +119,11 @@ describe('Resolve', () => {
                 done(new Error('Too many subscription fired'));
               },
             ).catch(done);
-          })
-          .catch(done);
+          }).then(() => {
+            pubsub.publish('printRootChannel', { printRoot: subscriptionRoot });
+          }).catch(done);
       });
 
-      pubsub.publish('printRootChannel', { printRoot: subscriptionRoot });
 
       firstSubsTriggered
         .then(() =>