feat(Iterator): add iterator return to catch operators

ReactiveX · Aug 17, 2017 · a7898ca · a7898ca
1 parent 336aa07
commit a7898ca
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/src/asynciterable/catch.ts b/src/asynciterable/catch.ts
@@ -1,4 +1,5 @@
 import { AsyncIterableX } from '../asynciterable';
+import { returnAsyncIterator } from '../internal/returniterator';
 
 class CatchAllAsyncIterable<TSource> extends AsyncIterableX<TSource> {
   private _source: Iterable<AsyncIterable<TSource>>;
@@ -22,11 +23,15 @@ class CatchAllAsyncIterable<TSource> extends AsyncIterableX<TSource> {
 
         try {
           const { done, value } = await it.next();
-          if (done) { break; }
+          if (done) {
+            await returnAsyncIterator(it);
+            break;
+          }
           c = value;
         } catch (e) {
           error = e;
           hasError = true;
+          await returnAsyncIterator(it);
           break;
         }
 

diff --git a/src/asynciterable/catchwith.ts b/src/asynciterable/catchwith.ts
@@ -1,4 +1,5 @@
 import { AsyncIterableX } from '../asynciterable';
+import { returnAsyncIterator } from '../internal/returniterator';
 
 class CatchWithAsyncIterable<TSource> extends AsyncIterableX<TSource> {
   private _source: AsyncIterable<TSource>;
@@ -19,10 +20,14 @@ class CatchWithAsyncIterable<TSource> extends AsyncIterableX<TSource> {
 
       try {
         c = await it.next();
-        if (c.done) { break; }
+        if (c.done) {
+          await returnAsyncIterator(it);
+          break;
+        }
       } catch (e) {
         err = await this._handler(e);
         hasError = true;
+        await returnAsyncIterator(it);
         break;
       }
 

diff --git a/src/internal/returniterator.ts b/src/internal/returniterator.ts
@@ -0,0 +1,17 @@
+/**
+ * @ignore
+ */
+export function returnIterator<T>(it: Iterator<T>) {
+  if (typeof it.return === 'function') {
+    it.return();
+  }
+}
+
+/**
+ * @ignore
+ */
+export async function returnAsyncIterator<T>(it: AsyncIterator<T>): Promise<void> {
+  if (typeof it.return === 'function') {
+    await it.return();
+  }
+}
diff --git a/src/iterable/catch.ts b/src/iterable/catch.ts
@@ -1,4 +1,5 @@
 import { IterableX } from '../iterable';
+import { returnIterator } from '../internal/returniterator';
 
 class CatchIterable<TSource> extends IterableX<TSource> {
   private _source: Iterable<Iterable<TSource>>;
@@ -22,11 +23,15 @@ class CatchIterable<TSource> extends IterableX<TSource> {
 
         try {
           const { done, value } = it.next();
-          if (done) { break; }
+          if (done) {
+            returnIterator(it);
+            break;
+          }
           c = value;
         } catch (e) {
           error = e;
           hasError = true;
+          returnIterator(it);
           break;
         }
 

diff --git a/src/iterable/catchwith.ts b/src/iterable/catchwith.ts
@@ -1,4 +1,5 @@
 import { IterableX } from '../iterable';
+import { returnIterator } from '../internal/returniterator';
 
 class CatchWithIterable<TSource> extends IterableX<TSource> {
   private _source: Iterable<TSource>;
@@ -17,10 +18,14 @@ class CatchWithIterable<TSource> extends IterableX<TSource> {
 
       try {
         c = it.next();
-        if (c.done) { break; }
+        if (c.done) {
+          returnIterator(it);
+          break;
+        }
       } catch (e) {
         err = this._handler(e);
         hasError = true;
+        returnIterator(it);
         break;
       }