Merge pull request #5814 from use-strict/angularjs-filter-service

angularjs - better granularity for filter service parameter types

angularjs/angular-tests.ts

@@ -933,3 +933,19 @@ function NgModelControllerTyping() {
             });
     };
 }
+
+function ngFilterTyping() {
+    var $filter:  angular.IFilterService;
+    var items: string[];
+    
+    $filter("name")(items, "test");
+    $filter("name")(items, {name: "test"});
+    $filter("name")(items, (val, index, array) => {
+        return array;
+    });
+    $filter("name")(items, (val, index, array) => {
+        return array;
+    }, (actual, expected) => {
+        return actual == expected;
+    });
+}

angularjs/angular.d.ts

@@ -782,7 +782,23 @@ declare module angular {
          *
          * @param name Name of the filter function to retrieve
          */
-        (name: string): Function;
+        (name: string): IFilterFunc;
+    }
+    
+    interface IFilterFunc {
+        <T>(array: T[], expression: string | IFilterPatternObject | IFilterPredicateFunc<T>, comparator?: IFilterComparatorFunc<T>|boolean): T[];
+    }
+    
+    interface IFilterPatternObject {
+        [name: string]: string;
+    }
+    
+    interface IFilterPredicateFunc<T> {
+        (value: T, index: number, array: T[]): T[];
+    }
+    
+    interface IFilterComparatorFunc<T> {
+        (actual: T, expected: T): boolean;
     }
 
     /**