fix(core): uses take operator when transforming observables into prom…

…ises
rafamel · Oct 24, 2019 · 5ce0ffc · 5ce0ffc
1 parent 018c64f
commit 5ce0ffc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/core/src/application/merge-intercepts.ts b/packages/core/src/application/merge-intercepts.ts
@@ -14,6 +14,7 @@ import {
 } from '~/inspect';
 import { replace } from '~/transform';
 import { allof } from '~/create';
+import { take } from 'rxjs/operators';
 
 export function mergeIntercepts(
   collection: CollectionTreeImplementation
@@ -65,7 +66,9 @@ export function serviceIntercepts(
         resolve(data: any, context, info): Promise<any> {
           return interceptFn(data, context, info, (data: any) => {
             return from(resolve.call(this, data, context, info));
-          }).toPromise();
+          })
+            .pipe(take(1))
+            .toPromise();
         }
       };
     }

diff --git a/packages/core/src/transform/to.ts b/packages/core/src/transform/to.ts
@@ -15,6 +15,7 @@ import {
   isServiceImplementation,
   isServiceSubscription
 } from '~/inspect';
+import { take } from 'rxjs/operators';
 
 export function toImplementation<T extends CollectionTree>(
   collection: T,
@@ -64,7 +65,10 @@ export function toUnary<
       ...element,
       kind: 'query',
       resolve(...args: any): Promise<any> {
-        return resolve.apply(this, args).toPromise();
+        return resolve
+          .apply(this, args)
+          .pipe(take(1))
+          .toPromise();
       }
     };
   }) as AbstractCollectionTree<Q, M, never>;