Skip to content

Commit

Permalink
style(fromObservable): fix type style
Browse files Browse the repository at this point in the history
BREAKING CHANGE: remove IFromObservable type.
  • Loading branch information
yisraelx committed Sep 17, 2017
1 parent ac2f9ae commit dfafb24
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion modules/-rxjs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
*/

export { default as Promises } from '@promises/core';
export { default as fromObservable, IFromObservable } from '@promises/from-observable';
export { default as fromObservable } from '@promises/from-observable';
export { default as toObservable } from '@promises/to-observable';
9 changes: 4 additions & 5 deletions modules/from-observable/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,16 @@ import Promises from '@promises/core';
* });
* ```
*/
function fromObservable<T>(observe: Observable<T>): Promises<T> {
function fromObservableStatic<T>(observe: Observable<T>): Promises<T> {
return new Promises((resolve, reject) => {
let value: any;
observe.subscribe((x: T) => value = x, (err: any) => reject(err), () => resolve(value));
});
}

export default fromObservable;
export type IFromObservable = typeof fromObservable;
export default fromObservableStatic;

Promises._setOnConstructor('fromObservable', fromObservable);
Promises._setOnConstructor('fromObservable', fromObservableStatic);

declare module '@promises/core' {
namespace Promises {
Expand All @@ -52,6 +51,6 @@ declare module '@promises/core' {
* });
* ```
*/
export let fromObservable: IFromObservable;
export let fromObservable: typeof fromObservableStatic;
}
}

0 comments on commit dfafb24

Please sign in to comment.