diff --git a/types/d3-array/d3-array-tests.ts b/types/d3-array/d3-array-tests.ts index 04478567e6..f202ab2fb9 100644 --- a/types/d3-array/d3-array-tests.ts +++ b/types/d3-array/d3-array-tests.ts @@ -957,8 +957,3 @@ num = d3Array.thresholdScott(readonlyNumbersArray, -1, 234); num = d3Array.thresholdSturges(numbersArray); num = d3Array.thresholdSturges(typedArray); num = d3Array.thresholdSturges(readonlyNumbersArray); - -// Deprecated ================================================================== - -const histDeprecatedNumber: d3Array.HistogramGenerator = d3Array.histogram(); -const histDeprecatedDate: d3Array.HistogramGenerator = d3Array.histogram(); diff --git a/types/d3-array/index.d.ts b/types/d3-array/index.d.ts index b7949ec870..1e73813965 100644 --- a/types/d3-array/index.d.ts +++ b/types/d3-array/index.d.ts @@ -156,19 +156,19 @@ export function variance(array: Iterable, accessor: (datum: T, index: numb export function scan(array: Iterable, comparator?: (a: number, b: number) => number): number | undefined; export function scan(array: Iterable, comparator: (a: T, b: T) => number): number | undefined; -export function bisectLeft(array: Iterable, x: number, lo?: number, hi?: number): number; -export function bisectLeft(array: Iterable, x: string, lo?: number, hi?: number): number; -export function bisectLeft(array: Iterable, x: Date, lo?: number, hi?: number): number; +export function bisectLeft(array: ArrayLike, x: number, lo?: number, hi?: number): number; +export function bisectLeft(array: ArrayLike, x: string, lo?: number, hi?: number): number; +export function bisectLeft(array: ArrayLike, x: Date, lo?: number, hi?: number): number; -export function bisectRight(array: Iterable, x: number, lo?: number, hi?: number): number; -export function bisectRight(array: Iterable, x: string, lo?: number, hi?: number): number; -export function bisectRight(array: Iterable, x: Date, lo?: number, hi?: number): number; +export function bisectRight(array: ArrayLike, x: number, lo?: number, hi?: number): number; +export function bisectRight(array: ArrayLike, x: string, lo?: number, hi?: number): number; +export function bisectRight(array: ArrayLike, x: Date, lo?: number, hi?: number): number; export const bisect: typeof bisectRight; export interface Bisector { - left(array: Iterable, x: U, lo?: number, hi?: number): number; - right(array: Iterable, x: U, lo?: number, hi?: number): number; + left(array: ArrayLike, x: U, lo?: number, hi?: number): number; + right(array: ArrayLike, x: U, lo?: number, hi?: number): number; } export function bisector(comparator: (a: T, b: U) => number): Bisector; @@ -180,7 +180,7 @@ export function bisector(accessor: (x: T) => U): Bisector; * @param array The array to partially sort (in place). * @param k The middle index for partial sorting. */ -export function quickselect(array: Iterable, k: number): T[]; +export function quickselect(array: ArrayLike, k: number): T[]; /** * Rearranges items so that all items in the [left, k] are the smallest. The k-th element will have the (k - left + 1)-th smallest value in [left, right]. @@ -189,7 +189,7 @@ export function quickselect(array: Iterable, k: number): T[]; * @param k The middle index for partial sorting. * @param left The left index of the range to sort. */ -export function quickselect(array: Iterable, k: number, left: number): T[]; +export function quickselect(array: ArrayLike, k: number, left: number): T[]; /** * Rearranges items so that all items in the [left, k] are the smallest. The k-th element will have the (k - left + 1)-th smallest value in [left, right]. @@ -199,7 +199,7 @@ export function quickselect(array: Iterable, k: number, left: number): T[] * @param left The left index of the range to sort. * @param right The right index. */ -export function quickselect(array: Iterable, k: number, left: number, right: number): T[]; +export function quickselect(array: ArrayLike, k: number, left: number, right: number): T[]; /** * Rearranges items so that all items in the [left, k] are the smallest. The k-th element will have the (k - left + 1)-th smallest value in [left, right]. @@ -210,7 +210,7 @@ export function quickselect(array: Iterable, k: number, left: number, righ * @param right The right index. * @param compare The compare function. */ -export function quickselect(array: Iterable, k: number, left: number, right: number, compare: (a: Primitive | undefined, b: Primitive | undefined) => number): T[]; +export function quickselect(array: ArrayLike, k: number, left: number, right: number, compare: (a: Primitive | undefined, b: Primitive | undefined) => number): T[]; // NB. this is limited to primitive values due to D3's use of the <, >, and >= operators. Results get weird for object instances. /** @@ -252,7 +252,7 @@ export function rollup(a: Iterable, reduce: (va * @param a First input array. * @param b Second input array. */ -export function cross(a: Iterable, b: ArrayLike): Array<[S, T]>; +export function cross(a: Iterable, b: Iterable): Array<[S, T]>; /** * Returns the Cartesian product of the two arrays a and b.