PR-50377-redo-filterBooleanOverload

Author: craigphicks

src/compiler/checker.ts

@@ -14748,21 +14748,71 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
      * Return the signatures of the given kind in the given type. Creates synthetic union signatures when necessary and
      * maps primitive types and type parameters are to their apparent types.
      */
-    function getSignaturesOfType(type: Type, kind: SignatureKind): readonly Signature[] {
-        const result = getSignaturesOfStructuredType(getReducedApparentType(type), kind);
-        if (kind === SignatureKind.Call && !length(result) && type.flags & TypeFlags.Union) {
-            if ((type as UnionType).arrayFallbackSignatures) {
-                return (type as UnionType).arrayFallbackSignatures!;
-            }
-            // If the union is all different instantiations of a member of the global array type...
-            let memberName: __String;
-            if (everyType(type, t => !!t.symbol?.parent && isArrayOrTupleSymbol(t.symbol.parent) && (!memberName ? (memberName = t.symbol.escapedName, true) : memberName === t.symbol.escapedName))) {
-                // Transform the type from `(A[] | B[])["member"]` to `(A | B)[]["member"]` (since we pretend array is covariant anyway)
-                const arrayArg = mapType(type, t => getMappedType((isReadonlyArraySymbol(t.symbol.parent) ? globalReadonlyArrayType : globalArrayType).typeParameters![0], (t as AnonymousType).mapper!));
-                const arrayType = createArrayType(arrayArg, someType(type, t => isReadonlyArraySymbol(t.symbol.parent)));
-                return (type as UnionType).arrayFallbackSignatures = getSignaturesOfType(getTypeOfPropertyOfType(arrayType, memberName!)!, kind);
-            }
-            (type as UnionType).arrayFallbackSignatures = result;
+    function getSignaturesOfType(typeIn: Type, kind: SignatureKind): readonly Signature[] {
+        const reducedType = getReducedApparentType(typeIn);
+        function carveoutResult(): readonly Signature[] | undefined {
+            if (kind === SignatureKind.Call && reducedType.flags & TypeFlags.Union) {
+                // If the union is all different instantiations of a member of the global array type...
+                let memberName: __String;
+                if (everyType(reducedType, t => !!t.symbol?.parent && isArrayOrTupleSymbol(t.symbol.parent) && (!memberName ? (memberName = t.symbol.escapedName, true) : memberName === t.symbol.escapedName))) {
+                    if ((reducedType as UnionType).arrayFallbackSignatures) {
+                        return (reducedType as UnionType).arrayFallbackSignatures!;
+                    }
+                    //const numberOfOverloads = (reducedType as UnionType).types[0].symbol.declarations?.length;
+
+                    // calculate return types as union of return types over the associated type, rather than return type associated with the union of types
+                    const numTypes = (reducedType as UnionType).types.length;
+                    const numSigs = (reducedType as UnionType).types[0].symbol.declarations?.length;
+                    Debug.assert(numSigs);
+                    const returnTypes = (new Array(numSigs).fill(/*value*/ undefined)).map((_,isig): Type | undefined =>{
+                        // getUnionType(*,UnionReduction.Subtype) doesn't detect duplicate types (unless I'm mistaken) so use set first.
+                        const rtset = new Set<Type>();
+                        new Array(numTypes).fill(/*value*/ undefined).forEach((_,itype)=>{
+                            // Notice we potentially generate the whole signature to get the return type.
+                            // Maybe that could be avoided?
+                            const callSignatures = ((reducedType as UnionType).types[itype] as ObjectType).callSignatures
+                                ?? getSignaturesOfStructuredType((reducedType as UnionType).types[itype] as ObjectType, SignatureKind.Call);
+                            if (callSignatures[isig].typeParameters) return; // skip generic signatures, i.e. <S>
+                            const returnType = callSignatures[isig].resolvedReturnType
+                                ?? getReturnTypeOfSignature(callSignatures[isig]);
+                            Debug.assert(returnType);
+                            rtset.add(returnType);
+                        });
+                        const art: Type[]=[];
+                        rtset.forEach((rt)=>art.push(rt));
+                        if (art.length===0) return undefined;
+                        if (art.length===1) return art[0];
+                        return getUnionType(art,UnionReduction.Subtype);
+                    });
+
+                    // Transform the type from `(A[] | B[])["member"]` to `(A | B)[]["member"]` (since we pretend array is covariant anyway)
+                    const arrayArg = mapType(reducedType, t => getMappedType((isReadonlyArraySymbol(t.symbol.parent) ? globalReadonlyArrayType : globalArrayType).typeParameters![0], (t as AnonymousType).mapper!));
+                    const arrayType = createArrayType(arrayArg, someType(reducedType, t => isReadonlyArraySymbol(t.symbol.parent)));
+                    const result = getSignaturesOfType(getTypeOfPropertyOfType(arrayType, memberName!)!, kind);
+
+                    returnTypes.forEach((returnType,sigidx) => {
+                        if (returnType) result[sigidx].resolvedReturnType = returnTypes[sigidx];
+                    });
+                    return (reducedType as UnionType).arrayFallbackSignatures = result;
+
+                    // const arrayArg = mapType(type, t => getMappedType((isReadonlyArraySymbol(t.symbol.parent) ? globalReadonlyArrayType : globalArrayType).typeParameters![0], (t as AnonymousType).mapper!));
+                    // const arrayType = createArrayType(arrayArg, someType(type, t => isReadonlyArraySymbol(t.symbol.parent)));
+                    // return (type as UnionType).arrayFallbackSignatures = getSignaturesOfType(getTypeOfPropertyOfType(arrayType, memberName!)!, kind);
+                }
+            }
+            return undefined;
+        }
+        let result = carveoutResult();
+        if (result) return result;
+
+        if (kind === SignatureKind.Call && reducedType.flags & TypeFlags.Union) {
+            if ((reducedType as UnionType).arrayFallbackSignatures) {
+                return (reducedType as UnionType).arrayFallbackSignatures!;
+            }
+        }
+        result = getSignaturesOfStructuredType(reducedType, kind);
+        if (kind === SignatureKind.Call && reducedType.flags & TypeFlags.Union) {
+            (reducedType as UnionType).arrayFallbackSignatures = result;
         }
         return result;
     }

src/lib/es5.d.ts

@@ -1257,6 +1257,12 @@ interface ReadonlyArray<T> {
      * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value.
      */
     filter<S extends T>(predicate: (value: T, index: number, array: readonly T[]) => value is S, thisArg?: any): S[];
+    /**
+     * Returns the non-Falsy elements of an array
+     * @param predicate Must be exactly "Boolean"
+     * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value.
+     */
+    filter(predicate: BooleanConstructor, thisArg?: any): (T extends false | 0 | "" | null | undefined | 0n ? never : T)[];
     /**
      * Returns the elements of an array that meet the condition specified in a callback function.
      * @param predicate A function that accepts up to three arguments. The filter method calls the predicate function one time for each element in the array.
@@ -1448,6 +1454,12 @@ interface Array<T> {
      * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value.
      */
     filter<S extends T>(predicate: (value: T, index: number, array: T[]) => value is S, thisArg?: any): S[];
+    /**
+     * Returns the non-Falsy elements of an array
+     * @param predicate Must be exactly "Boolean"
+     * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value.
+     */
+    filter(predicate: BooleanConstructor, thisArg?: any): (T extends false | 0 | "" | null | undefined | 0n ? never : T)[];
     /**
      * Returns the elements of an array that meet the condition specified in a callback function.
      * @param predicate A function that accepts up to three arguments. The filter method calls the predicate function one time for each element in the array.

tests/baselines/reference/arrayFilter.symbols

@@ -16,9 +16,9 @@ var foo = [
 ]
 
 foo.filter(x => x.name); //should accepted all possible types not only boolean! 
->foo.filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>foo.filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >foo : Symbol(foo, Decl(arrayFilter.ts, 0, 3))
->filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(arrayFilter.ts, 6, 11))
 >x.name : Symbol(name, Decl(arrayFilter.ts, 1, 5))
 >x : Symbol(x, Decl(arrayFilter.ts, 6, 11))

tests/baselines/reference/arrayFilter.types

@@ -23,9 +23,9 @@ var foo = [
 
 foo.filter(x => x.name); //should accepted all possible types not only boolean! 
 >foo.filter(x => x.name) : { name: string; }[]
->foo.filter : { <S extends { name: string; }>(predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => value is S, thisArg?: any): S[]; (predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => unknown, thisArg?: any): { name: string; }[]; }
+>foo.filter : { <S extends { name: string; }>(predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => value is S, thisArg?: any): S[]; (predicate: BooleanConstructor, thisArg?: any): { name: string; }[]; (predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => unknown, thisArg?: any): { name: string; }[]; }
 >foo : { name: string; }[]
->filter : { <S extends { name: string; }>(predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => value is S, thisArg?: any): S[]; (predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => unknown, thisArg?: any): { name: string; }[]; }
+>filter : { <S extends { name: string; }>(predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => value is S, thisArg?: any): S[]; (predicate: BooleanConstructor, thisArg?: any): { name: string; }[]; (predicate: (value: { name: string; }, index: number, array: { name: string; }[]) => unknown, thisArg?: any): { name: string; }[]; }
 >x => x.name : (x: { name: string; }) => string
 >x : { name: string; }
 >x.name : string

tests/baselines/reference/arrayFilterBooleanOverload#56013WithoutExternalOverload.js

@@ -0,0 +1,32 @@
+//// [tests/cases/compiler/arrayFilterBooleanOverload#56013WithoutExternalOverload.ts] ////
+
+//// [arrayFilterBooleanOverload#56013WithoutExternalOverload.ts]
+type NonFalsy<T> = T extends false | 0 | "" | null | undefined | 0n
+    ? never
+    : T;
+
+const id = <T,>() => (t: T) => !!t;
+
+['foo', 'bar'].filter(id()); // // expect id() = (t: string) => boolean
+
+['foo', 'bar', 1].filter(id()); // // expect id() = (t: string | number) => boolean
+
+declare const maybe: boolean;
+(maybe ? ['foo', 'bar'] : [1] ).filter(id()); // expect id() = (t: string | number) => boolean
+
+['foo', 'bar', undefined].filter(id()); // expect id() = (t: string | undefined) => boolean
+
+
+//// [arrayFilterBooleanOverload#56013WithoutExternalOverload.js]
+"use strict";
+const id = () => (t) => !!t;
+['foo', 'bar'].filter(id()); // // expect id() = (t: string) => boolean
+['foo', 'bar', 1].filter(id()); // // expect id() = (t: string | number) => boolean
+(maybe ? ['foo', 'bar'] : [1]).filter(id()); // expect id() = (t: string | number) => boolean
+['foo', 'bar', undefined].filter(id()); // expect id() = (t: string | undefined) => boolean
+
+
+//// [arrayFilterBooleanOverload#56013WithoutExternalOverload.d.ts]
+type NonFalsy<T> = T extends false | 0 | "" | null | undefined | 0n ? never : T;
+declare const id: <T>() => (t: T) => boolean;
+declare const maybe: boolean;

tests/baselines/reference/arrayFilterBooleanOverload#56013WithoutExternalOverload.symbols

@@ -0,0 +1,44 @@
+//// [tests/cases/compiler/arrayFilterBooleanOverload#56013WithoutExternalOverload.ts] ////
+
+=== arrayFilterBooleanOverload#56013WithoutExternalOverload.ts ===
+type NonFalsy<T> = T extends false | 0 | "" | null | undefined | 0n
+>NonFalsy : Symbol(NonFalsy, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 0, 0))
+>T : Symbol(T, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 0, 14))
+>T : Symbol(T, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 0, 14))
+
+    ? never
+    : T;
+>T : Symbol(T, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 0, 14))
+
+const id = <T,>() => (t: T) => !!t;
+>id : Symbol(id, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 5))
+>T : Symbol(T, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 12))
+>t : Symbol(t, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 22))
+>T : Symbol(T, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 12))
+>t : Symbol(t, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 22))
+
+['foo', 'bar'].filter(id()); // // expect id() = (t: string) => boolean
+>['foo', 'bar'].filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>id : Symbol(id, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 5))
+
+['foo', 'bar', 1].filter(id()); // // expect id() = (t: string | number) => boolean
+>['foo', 'bar', 1].filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>id : Symbol(id, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 5))
+
+declare const maybe: boolean;
+>maybe : Symbol(maybe, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 10, 13))
+
+(maybe ? ['foo', 'bar'] : [1] ).filter(id()); // expect id() = (t: string | number) => boolean
+>(maybe ? ['foo', 'bar'] : [1] ).filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --) ... and 1 more)
+>maybe : Symbol(maybe, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 10, 13))
+>filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --) ... and 1 more)
+>id : Symbol(id, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 5))
+
+['foo', 'bar', undefined].filter(id()); // expect id() = (t: string | undefined) => boolean
+>['foo', 'bar', undefined].filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>undefined : Symbol(undefined)
+>filter : Symbol(Array.filter, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>id : Symbol(id, Decl(arrayFilterBooleanOverload#56013WithoutExternalOverload.ts, 4, 5))
+