fix filter overloads in NonEmptyArray / ReadonlyNonEmptyArray, c…

…loses #1388

CHANGELOG.md

@@ -15,6 +15,11 @@
 **Note**: A feature tagged as Experimental is in a
 high state of flux, you're at risk of it changing without notice.
 
+# 2.9.4
+
+- **Bug Fix**
+  - fix `filter` overloads in `NonEmptyArray` / `ReadonlyNonEmptyArray`, closes #1388 (@gcanti)
+
 # 2.9.3
 
 - **Polish**

docs/modules/NonEmptyArray.ts.md

@@ -353,7 +353,7 @@ Added in v2.0.0
 ```ts
 export declare function filter<A, B extends A>(
   refinement: Refinement<A, B>
-): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<A>>
+): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<B>>
 export declare function filter<A>(predicate: Predicate<A>): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<A>>
 ```
 

docs/modules/ReadonlyNonEmptyArray.ts.md

@@ -913,7 +913,7 @@ Added in v2.6.3
 ```ts
 export declare function filter<A, B extends A>(
   refinement: Refinement<A, B>
-): (nea: ReadonlyNonEmptyArray<A>) => Option<ReadonlyNonEmptyArray<A>>
+): (nea: ReadonlyNonEmptyArray<A>) => Option<ReadonlyNonEmptyArray<B>>
 export declare function filter<A>(
   predicate: Predicate<A>
 ): (nea: ReadonlyNonEmptyArray<A>) => Option<ReadonlyNonEmptyArray<A>>

dtslint/ts3.5/NonEmptyArray.ts

@@ -2,7 +2,6 @@ import * as _ from '../../src/NonEmptyArray'
 import { Ord } from '../../src/Ord'
 import { pipe } from '../../src/function'
 
-declare const as: Array<string>
 declare const neas: _.NonEmptyArray<string>
 declare const nens: _.NonEmptyArray<number>
 declare const netns: _.NonEmptyArray<[number, string]>
@@ -89,3 +88,20 @@ pipe(
   _.bind('a', () => _.of(1)),
   _.bind('b', () => _.of('b'))
 )
+
+//
+// filter
+//
+
+declare const isNumber1: (sn: string | number) => sn is number
+declare const isNumber2: (sn: unknown) => sn is number
+declare const neasn: _.NonEmptyArray<string | number>
+
+// $ExpectType Option<NonEmptyArray<number>>
+pipe(neasn, _.filter(isNumber1))
+// $ExpectType Option<NonEmptyArray<number>>
+_.filter(isNumber1)(neasn)
+// $ExpectType Option<NonEmptyArray<number>>
+pipe(neasn, _.filter(isNumber2))
+// $ExpectType Option<NonEmptyArray<number>>
+_.filter(isNumber2)(neasn)

dtslint/ts3.5/ReadonlyNonEmptyArray.ts

@@ -89,3 +89,20 @@ pipe(
   _.bind('a', () => _.of(1)),
   _.bind('b', () => _.of('b'))
 )
+
+//
+// filter
+//
+
+declare const isNumber1: (sn: string | number) => sn is number
+declare const isNumber2: (sn: unknown) => sn is number
+declare const neasn: _.ReadonlyNonEmptyArray<string | number>
+
+// $ExpectType Option<ReadonlyNonEmptyArray<number>>
+pipe(neasn, _.filter(isNumber1))
+// $ExpectType Option<ReadonlyNonEmptyArray<number>>
+_.filter(isNumber1)(neasn)
+// $ExpectType Option<ReadonlyNonEmptyArray<number>>
+pipe(neasn, _.filter(isNumber2))
+// $ExpectType Option<ReadonlyNonEmptyArray<number>>
+_.filter(isNumber2)(neasn)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fp-ts",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "Functional programming in TypeScript",
   "main": "lib/index.js",
   "module": "es6/index.js",

src/NonEmptyArray.ts

@@ -283,7 +283,7 @@ export function copy<A>(nea: NonEmptyArray<A>): NonEmptyArray<A> {
  */
 export function filter<A, B extends A>(
   refinement: Refinement<A, B>
-): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<A>>
+): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<B>>
 export function filter<A>(predicate: Predicate<A>): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<A>>
 export function filter<A>(predicate: Predicate<A>): (nea: NonEmptyArray<A>) => Option<NonEmptyArray<A>> {
   return RNEA.filter(predicate) as any

src/ReadonlyNonEmptyArray.ts

@@ -343,7 +343,7 @@ export function modifyAt<A>(
  */
 export function filter<A, B extends A>(
   refinement: Refinement<A, B>
-): (nea: ReadonlyNonEmptyArray<A>) => Option<ReadonlyNonEmptyArray<A>>
+): (nea: ReadonlyNonEmptyArray<A>) => Option<ReadonlyNonEmptyArray<B>>
 export function filter<A>(predicate: Predicate<A>): (nea: ReadonlyNonEmptyArray<A>) => Option<ReadonlyNonEmptyArray<A>>
 export function filter<A>(
   predicate: Predicate<A>