revert type changes; remove reducer type tests for now

Author: Fil

src/channel.d.ts

@@ -210,7 +210,7 @@ export type ChannelDomainValueSpec = ChannelDomainValue | ({value: ChannelDomain
 export type ChannelDomainSort = {[key in ScaleName]?: ChannelDomainValueSpec} & ChannelDomainOptions;
 
 /** How to reduce channel values, e.g. when binning or grouping. */
-export type ChannelReducers<T = Reducer> = {[key in ChannelName]?: T | null};
+export type ChannelReducers<T = Reducer> = {[key in ChannelName]?: T | {reduce: T; scale?: Channel["scale"]} | null};
 
 /** Abstract (unscaled) values, and associated scale, per channel. */
 export type ChannelStates = {[key in ChannelName]?: {value: any[]; scale: ScaleName | null}};

src/marks/area.d.ts

@@ -1,8 +1,7 @@
 import type {ChannelValue, ChannelValueSpec} from "../channel.js";
 import type {CurveOptions} from "../curve.js";
 import type {Data, MarkOptions, RenderableMark} from "../mark.js";
-import type {BinOptions} from "../transforms/bin.js";
-import type {BinReducer} from "../reducer.js";
+import type {BinOptions, BinReducer} from "../transforms/bin.js";
 import type {StackOptions} from "../transforms/stack.js";
 
 export interface AreaOptions extends MarkOptions, StackOptions, CurveOptions {

src/marks/line.d.ts

@@ -2,8 +2,7 @@ import type {ChannelValue, ChannelValueSpec} from "../channel.js";
 import type {CurveAutoOptions} from "../curve.js";
 import type {Data, MarkOptions, RenderableMark} from "../mark.js";
 import type {MarkerOptions} from "../marker.js";
-import type {BinOptions} from "../transforms/bin.js";
-import type {BinReducer} from "../reducer.js";
+import type {BinOptions, BinReducer} from "../transforms/bin.js";
 
 export interface LineOptions extends MarkOptions, MarkerOptions, CurveAutoOptions {
   x?: ChannelValueSpec;

src/marks/linearRegression.d.ts

@@ -1,7 +1,6 @@
 import type {ChannelValue, ChannelValueSpec} from "../channel.js";
 import type {Data, MarkOptions, RenderableMark} from "../mark.js";
-import type {BinOptions} from "../transforms/bin.js";
-import type {BinReducer} from "../reducer.js";
+import type {BinOptions, BinReducer} from "../transforms/bin.js";
 
 interface LinearRegressionOptions extends MarkOptions, BinOptions {
   x?: ChannelValueSpec;

src/reducer.d.ts

@@ -1,5 +1,3 @@
-import type {Channel} from "./channel.js";
-
 type Digit = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
 
 export type ReducerPercentile =
@@ -29,36 +27,9 @@ export type ReducerName =
 
 export type ReducerFunction = (values: any[]) => any;
 
-export type ReducerImplementation =
-  | {
-      reduce: ReducerName;
-      scale?: Channel["scale"];
-    }
-  | {
-      reduce(index: number[], values: any[]): any;
-    }
-  | {
-      reduce(index: number[], values: any[], summary?: any): any;
-      scope: "data" | "facet";
-    };
-
-export type BinReducerImplementation =
-  | {
-      reduce: BinReducerName;
-      scale?: Channel["scale"];
-    }
-  | {
-      reduce(index: number[], values: any[], extent: {x1: any; y1: any; x2: any; y2: any}): any;
-    }
-  | {
-      reduce(index: number[], values: any[], summary?: any, extent?: {x1: any; y1: any; x2: any; y2: any}): any;
-      scope: "data" | "facet";
-    };
+// TODO scope, label
+export interface ReducerImplementation {
+  reduce(index: number[], values: any[]): any;
+}
 
 export type Reducer = ReducerName | ReducerFunction | ReducerImplementation;
-
-type BinReducerFunction = (values: any[], extent: {x1: any; y1: any; x2: any; y2: any}) => any;
-
-type BinReducerName = ReducerName | "x" | "x1" | "x2" | "y" | "y1" | "y2";
-
-export type BinReducer = BinReducerName | BinReducerFunction | BinReducerImplementation;

src/transforms/bin.d.ts

@@ -1,6 +1,6 @@
 import type {ChannelReducers} from "../channel.js";
 import type {RangeInterval} from "../interval.js";
-import type {BinReducer} from "../reducer.js";
+import type {Reducer} from "../reducer.js";
 import type {Transformed} from "./basic.js";
 
 export type ThresholdsName = "freedman-diaconis" | "scott" | "sturges" | "auto";
@@ -47,6 +47,24 @@ export interface BinOptions {
   interval?: RangeInterval;
 }
 
+export type BinReducer =
+  | Reducer
+  | BinReducerFunction
+  | BinReducerImplementation
+  | "x"
+  | "x1"
+  | "x2"
+  | "y"
+  | "y1"
+  | "y2";
+
+export type BinReducerFunction = (values: any[], extent: {x1: any; y1: any; x2: any; y2: any}) => any;
+
+// TODO scope, label
+export interface BinReducerImplementation {
+  reduce(index: number[], values: any[], extent: {x1: any; y1: any; x2: any; y2: any}): any;
+}
+
 export interface BinOutputOptions extends BinOptions {
   /**
    * The data reducer; defaults to the array of values that belong to the bin in