From 9ef6dc6a7b40bc8fd86ec6e580deda94652668c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Curley?= Date: Mon, 10 Jul 2017 13:04:34 +0100 Subject: [PATCH 1/4] Flesh out Subscriable type to better match ES Observable spec --- types/recompose/index.d.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts index 3e3d6b85ae..ee99adca68 100644 --- a/types/recompose/index.d.ts +++ b/types/recompose/index.d.ts @@ -16,8 +16,18 @@ declare module 'recompose' { type mapper = (input: TInner) => TOutter; type predicate = mapper; type predicateDiff = (current: T, next: T) => boolean + interface Observer { + next(value: T): void; + error(err: any): void; + complete(): void; + } + + interface Subscription { + unsubscribe(): void; + closed: boolean; + } interface Subscribable { - subscribe: Function; + subscribe(observer: Observer):Subscription; } interface ComponentEnhancer { From 7db3bd0d08ef03c278ac6311fb5a3d062e9d5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Curley?= Date: Mon, 10 Jul 2017 16:29:21 +0100 Subject: [PATCH 2/4] Was able to simplfy things --- types/recompose/index.d.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts index ee99adca68..6b84b33034 100644 --- a/types/recompose/index.d.ts +++ b/types/recompose/index.d.ts @@ -15,19 +15,10 @@ declare module 'recompose' { type Component

= ComponentClass

| StatelessComponent

; type mapper = (input: TInner) => TOutter; type predicate = mapper; - type predicateDiff = (current: T, next: T) => boolean - interface Observer { - next(value: T): void; - error(err: any): void; - complete(): void; - } + type predicateDiff = (current: T, next: T) => boolean} - interface Subscription { - unsubscribe(): void; - closed: boolean; - } interface Subscribable { - subscribe(observer: Observer):Subscription; + subscribe(observer: any):any; } interface ComponentEnhancer { From d58e9e015a85b38180c0c15a15dc2d15076d6175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Curley?= Date: Mon, 10 Jul 2017 16:45:11 +0100 Subject: [PATCH 3/4] Fix CI Fail; forgot Ctrl-S on my end --- types/recompose/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts index 6b84b33034..dedc360f4d 100644 --- a/types/recompose/index.d.ts +++ b/types/recompose/index.d.ts @@ -15,7 +15,7 @@ declare module 'recompose' { type Component

= ComponentClass

| StatelessComponent

; type mapper = (input: TInner) => TOutter; type predicate = mapper; - type predicateDiff = (current: T, next: T) => boolean} + type predicateDiff = (current: T, next: T) => boolean interface Subscribable { subscribe(observer: any):any; From e525932a5b6916f01c784763c0e4ee346d5213a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Curley?= Date: Mon, 10 Jul 2017 17:35:23 +0100 Subject: [PATCH 4/4] Rewrote again to match observable found in componentFromStream --- types/recompose/index.d.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts index dedc360f4d..09c8d6a59d 100644 --- a/types/recompose/index.d.ts +++ b/types/recompose/index.d.ts @@ -17,8 +17,17 @@ declare module 'recompose' { type predicate = mapper; type predicateDiff = (current: T, next: T) => boolean + interface Observer{ + next(props: T): void; + complete(): void; + } + + interface Subscription{ + unsubscribe(): void + } + interface Subscribable { - subscribe(observer: any):any; + subscribe(observer: Observer): Subscription; } interface ComponentEnhancer {