Removing the EnumerableKey type alias because DT linting is not good at dealing with it between different versions of TypeScript.

reubenrybnik · reubenrybnik · commit abe1df796adc · 2020-09-12T17:34:38.000-07:00
diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
@@ -83,8 +83,6 @@ declare module _ {
 
     type Collection<T> = List<T> | Dictionary<T>;
 
-    type EnumerableKey = string | number;
-
     type CollectionKey<V> =
         V extends never ? any
         : V extends List<any> ? number
@@ -106,16 +104,16 @@ declare module _ {
 
     type Iteratee<V, R, T extends TypeOfCollection<V, any> = TypeOfCollection<V>> =
         CollectionIterator<T, R, V> |
-        EnumerableKey |
-        EnumerableKey[] |
+        string | number |
+        (string | number)[] |
         Partial<T> |
         null |
         undefined;
 
     type IterateeResult<I, T> =
         I extends (...args: any[]) => infer R ? R
         : I extends keyof T ? T[I]
-        : I extends EnumerableKey | EnumerableKey[] ? any
+        : I extends string | number | (string | number)[] ? any
         : I extends object ? boolean
         : I extends null | undefined ? T
         : never;
@@ -158,7 +156,7 @@ declare module _ {
     // if T is a list, assume that it contains pairs of some type, so any
     // if T isn't a list, there's no way that it can provide pairs, so never
     type PairValue<T> =
-        T extends Readonly<[EnumerableKey, infer TValue]> ? TValue
+        T extends Readonly<[string | number, infer TValue]> ? TValue
         : T extends List<infer TValue> ? TValue
         : never;
 
@@ -488,7 +486,7 @@ declare module _ {
          * @returns The set of values for the specified `propertyName` for each
          * item in `collection`.
          **/
-        pluck<V extends Collection<any>, K extends EnumerableKey>(
+        pluck<V extends Collection<any>, K extends string | number>(
             collection: V,
             propertyName: K
         ): PropertyTypeOrAny<TypeOfCollection<V>, K>[];
@@ -558,7 +556,7 @@ declare module _ {
          **/
         groupBy<V extends Collection<any>>(
             collection: V,
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any
         ): Dictionary<TypeOfCollection<V>[]>;
 
@@ -576,7 +574,7 @@ declare module _ {
          **/
         indexBy<V extends Collection<any>>(
             collection: V,
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any): Dictionary<TypeOfCollection<V>>;
 
         /**
@@ -594,7 +592,7 @@ declare module _ {
          **/
         countBy<V extends Collection<any>>(
             collection: V,
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any
         ): Dictionary<number>;
 
@@ -873,7 +871,7 @@ declare module _ {
          * corresponding to those keys.
          * @returns An object comprised of the provided keys and values.
          **/
-        object<TList extends List<EnumerableKey>, TValue>(
+        object<TList extends List<string | number>, TValue>(
             list: TList,
             values: List<TValue>
         ): Dictionary<TValue | undefined>;
@@ -4258,7 +4256,7 @@ declare module _ {
          * @returns The set of values for the specified `propertyName` for each
          * item in the wrapped collection.
          **/
-        pluck<K extends EnumerableKey>(
+        pluck<K extends string | number>(
             propertyName: K
         ): PropertyTypeOrAny<T, K>[];
 
@@ -4314,7 +4312,7 @@ declare module _ {
          * the wrapped collection.
          **/
         groupBy(
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any
         ): Dictionary<T[]>;
 
@@ -4329,7 +4327,7 @@ declare module _ {
          * @returns A dictionary where each item in the wrapped collection is
          * assigned to the property designated by `iteratee`.
          **/
-        indexBy(iteratee?: Iteratee<V, EnumerableKey>, context?: any): Dictionary<T>;
+        indexBy(iteratee?: Iteratee<V, string | number>, context?: any): Dictionary<T>;
 
         /**
          * Sorts the wrapped collection into groups and returns a count for the
@@ -4344,7 +4342,7 @@ declare module _ {
          * elements from the wrapped collection.
          **/
         countBy(
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any
         ): Dictionary<number>;
 
@@ -5441,7 +5439,7 @@ declare module _ {
          * @returns A chain wrapper around The set of values for the specified
          * `propertyName` for each item in the wrapped collection.
          **/
-        pluck<K extends EnumerableKey>(
+        pluck<K extends string | number>(
             propertyName: K
         ): _Chain<PropertyTypeOrAny<T, K>>;
 
@@ -5506,7 +5504,7 @@ declare module _ {
          * the grouped elements from the wrapped collection.
          **/
         groupBy(
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any
         ): _Chain<T[], Dictionary<T[]>>;
 
@@ -5523,7 +5521,7 @@ declare module _ {
          * `iteratee`.
          **/
         indexBy(
-            iteratee?: Iteratee<V, EnumerableKey>,
+            iteratee?: Iteratee<V, string | number>,
             context?: any
         ): _Chain<T, Dictionary<T>>;
 
@@ -5540,7 +5538,7 @@ declare module _ {
          * the count of the grouped elements from the wrapped collection.
          **/
         countBy(
-            iterator?: Iteratee<V, EnumerableKey>,
+            iterator?: Iteratee<V, string | number>,
             context?: any
         ): _Chain<number, Dictionary<number>>;
 
diff --git a/types/underscore/underscore-tests.ts b/types/underscore/underscore-tests.ts
@@ -1023,7 +1023,7 @@ knownShallowPropertyResult; // $ExpectType string | StringRecord
 declare const unknownShallowPropertyResult: _.IterateeResult<typeof shallowProperty, NonIntersecting>;
 unknownShallowPropertyResult; // $ExpectType any
 
-declare const deepPropertyResult: _.IterateeResult<_.EnumerableKey[], StringRecord>;
+declare const deepPropertyResult: _.IterateeResult<(string | number)[], StringRecord>;
 deepPropertyResult; // $ExpectType any
 
 declare const nullResult: _.IterateeResult<null, StringRecord>;
