Merge pull request #549 from yovanoc/remove-iterall

feat: remove iterall

Author: davidyaha

package-lock.json

@@ -36,9 +36,6 @@
     "prepublish": "tsc",
     "prepublishOnly": "npm run test"
   },
-  "dependencies": {
-    "iterall": "^1.3.0"
-  },
   "peerDependencies": {
     "graphql-subscriptions": "^1.0.0 || ^2.0.0"
   },

package.json

@@ -1,4 +1,3 @@
-import { $$asyncIterator } from 'iterall';
 import { PubSubEngine } from 'graphql-subscriptions';
 
 /**
@@ -30,7 +29,7 @@ import { PubSubEngine } from 'graphql-subscriptions';
  * @property pubsub @type {PubSubEngine}
  * The PubSubEngine whose events will be observed.
  */
-export class PubSubAsyncIterator<T> implements AsyncIterator<T> {
+export class PubSubAsyncIterator<T> implements AsyncIterableIterator<T> {
 
   constructor(pubsub: PubSubEngine, eventNames: string | string[], options?: unknown) {
     this.pubsub = pubsub;
@@ -56,7 +55,7 @@ export class PubSubAsyncIterator<T> implements AsyncIterator<T> {
     return Promise.reject(error);
   }
 
-  public [$$asyncIterator]() {
+  public [Symbol.asyncIterator]() {
     return this;
   }
 

src/pubsub-async-iterator.ts

@@ -2,7 +2,6 @@ import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { mock } from 'simple-mock';
 import { parse, GraphQLSchema, GraphQLObjectType, GraphQLString, GraphQLFieldResolver } from 'graphql';
-import { isAsyncIterable } from 'iterall';
 import { subscribe } from 'graphql/subscription';
 
 import { RedisPubSub } from '../redis-pubsub';
@@ -83,7 +82,7 @@ describe('PubSubAsyncIterator', function() {
     subscribe({ schema, document: query})
       .then(ai => {
         // tslint:disable-next-line:no-unused-expression
-        expect(isAsyncIterable(ai)).to.be.true;
+				expect(ai[Symbol.asyncIterator]).not.to.be.undefined;
 
         const r = (ai as AsyncIterator<any>).next();
         setTimeout(() => pubsub.publish(FIRST_EVENT, {}), 50);
@@ -97,8 +96,8 @@ describe('PubSubAsyncIterator', function() {
   it('should allow pattern subscriptions', () =>
     subscribe({ schema, document: patternQuery })
       .then(ai => {
-        // tslint:disable-next-line:no-unused-expression
-        expect(isAsyncIterable(ai)).to.be.true;
+				// tslint:disable-next-line:no-unused-expression
+				expect(ai[Symbol.asyncIterator]).not.to.be.undefined;
 
         const r = (ai as AsyncIterator<any>).next();
         setTimeout(() => pubsub.publish(SECOND_EVENT, {}), 50);
@@ -112,8 +111,8 @@ describe('PubSubAsyncIterator', function() {
   it('should clear event handlers', () =>
     subscribe({ schema, document: query})
       .then(ai => {
-        // tslint:disable-next-line:no-unused-expression
-        expect(isAsyncIterable(ai)).to.be.true;
+				// tslint:disable-next-line:no-unused-expression
+				expect(ai[Symbol.asyncIterator]).not.to.be.undefined;
 
         pubsub.publish(FIRST_EVENT, {});
 

src/test/integration-tests.ts

@@ -1,7 +1,6 @@
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { spy, restore, stub } from 'simple-mock';
-import { isAsyncIterable } from 'iterall';
 import { RedisPubSub } from '../redis-pubsub';
 import * as IORedis from 'ioredis';
 
@@ -429,9 +428,9 @@ describe('PubSubAsyncIterator', () => {
     const eventName = 'test';
     const iterator = pubSub.asyncIterator(eventName);
     // tslint:disable-next-line:no-unused-expression
-    expect(iterator).to.exist;
-    // tslint:disable-next-line:no-unused-expression
-    expect(isAsyncIterable(iterator)).to.be.true;
+		expect(iterator).to.exist;
+		// tslint:disable-next-line:no-unused-expression
+		expect(iterator[Symbol.asyncIterator]).not.to.be.undefined;
   });
 
   it('should trigger event on asyncIterator when published', done => {

src/test/tests.ts

@@ -1,8 +1,6 @@
-import { $$asyncIterator } from 'iterall';
-
 export type FilterFn = (rootValue?: any, args?: any, context?: any, info?: any) => boolean;
 
-export const withFilter = (asyncIteratorFn: () => AsyncIterator<any>, filterFn: FilterFn) => {
+export const withFilter = (asyncIteratorFn: () => AsyncIterableIterator<any>, filterFn: FilterFn) => {
   return (rootValue: any, args: any, context: any, info: any): AsyncIterator<any> => {
     const asyncIterator = asyncIteratorFn();
 
@@ -33,7 +31,7 @@ export const withFilter = (asyncIteratorFn: () => AsyncIterator<any>, filterFn:
       throw(error) {
         return asyncIterator.throw(error);
       },
-      [$$asyncIterator]() {
+      [Symbol.asyncIterator]() {
         return this;
       },
     } as any;