Skip to content

Commit 4cf4d73

Browse files
authored
fix overload precedence (#1915)
1 parent cbb673d commit 4cf4d73

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/transforms/dodge.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ export interface DodgeYOptions extends DodgeOptions {
5959
*
6060
* If *dodgeOptions* is a string, it is shorthand for the dodge **anchor**.
6161
*/
62-
export function dodgeX<T>(dodgeOptions?: DodgeXOptions | DodgeXOptions["anchor"], options?: T): Initialized<T>;
6362
export function dodgeX<T>(options?: T & DodgeXOptions): Initialized<T>;
63+
export function dodgeX<T>(dodgeOptions?: DodgeXOptions | DodgeXOptions["anchor"], options?: T): Initialized<T>;
6464

6565
/**
6666
* Given an **x** position channel, derives a new **y** position channel that
@@ -71,5 +71,5 @@ export function dodgeX<T>(options?: T & DodgeXOptions): Initialized<T>;
7171
*
7272
* If *dodgeOptions* is a string, it is shorthand for the dodge **anchor**.
7373
*/
74-
export function dodgeY<T>(dodgeOptions?: DodgeYOptions | DodgeYOptions["anchor"], options?: T): Initialized<T>;
7574
export function dodgeY<T>(options?: T & DodgeYOptions): Initialized<T>;
75+
export function dodgeY<T>(dodgeOptions?: DodgeYOptions | DodgeYOptions["anchor"], options?: T): Initialized<T>;

src/transforms/normalize.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ export interface NormalizeOptions {
5656
* is used, the derived series values would be [*x₀* / *x₀*, *x₁* / *x₀*, *x₂* /
5757
* *x₀*, …] as in an index chart.
5858
*/
59-
export function normalizeX<T>(basis?: NormalizeBasis, options?: T): Transformed<T>;
6059
export function normalizeX<T>(options?: T & NormalizeOptions): Transformed<T>;
60+
export function normalizeX<T>(basis?: NormalizeBasis, options?: T): Transformed<T>;
6161

6262
/**
6363
* Groups data into series using the first channel of **z**, **fill**, or
@@ -67,8 +67,8 @@ export function normalizeX<T>(options?: T & NormalizeOptions): Transformed<T>;
6767
* is used, the derived series values would be [*y₀* / *y₀*, *y₁* / *y₀*, *y₂* /
6868
* *y₀*, …] as in an index chart.
6969
*/
70-
export function normalizeY<T>(basis?: NormalizeBasis, options?: T): Transformed<T>;
7170
export function normalizeY<T>(options?: T & NormalizeOptions): Transformed<T>;
71+
export function normalizeY<T>(basis?: NormalizeBasis, options?: T): Transformed<T>;
7272

7373
/**
7474
* Given a normalize *basis*, returns a corresponding map implementation for use

src/transforms/stack.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,24 @@ export interface StackOptions {
119119
* a label. If not specified, the input channel **x** defaults to the constant
120120
* one.
121121
*/
122-
export function stackX<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
123122
export function stackX<T>(options?: T & StackOptions): Transformed<T>;
123+
export function stackX<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
124124

125125
/**
126126
* Like **stackX**, but returns the starting position **x1** as the **x**
127127
* channel, for example to position a dot on the left-hand side of each element
128128
* of a stack.
129129
*/
130-
export function stackX1<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
131130
export function stackX1<T>(options?: T & StackOptions): Transformed<T>;
131+
export function stackX1<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
132132

133133
/**
134134
* Like **stackX**, but returns the starting position **x2** as the **x**
135135
* channel, for example to position a dot on the right-hand side of each element
136136
* of a stack.
137137
*/
138-
export function stackX2<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
139138
export function stackX2<T>(options?: T & StackOptions): Transformed<T>;
139+
export function stackX2<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
140140

141141
/**
142142
* Transforms a length channel **y** into starting and ending position channels
@@ -147,20 +147,20 @@ export function stackX2<T>(options?: T & StackOptions): Transformed<T>;
147147
* midpoint between **y1** and **y2**, for example to place a label. If not
148148
* specified, the input channel **y** defaults to the constant one.
149149
*/
150-
export function stackY<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
151150
export function stackY<T>(options?: T & StackOptions): Transformed<T>;
151+
export function stackY<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
152152

153153
/**
154154
* Like **stackY**, but returns the starting position **y1** as the **y**
155155
* channel, for example to position a dot at the bottom of each element of a
156156
* stack.
157157
*/
158-
export function stackY1<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
159158
export function stackY1<T>(options?: T & StackOptions): Transformed<T>;
159+
export function stackY1<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
160160

161161
/**
162162
* Like **stackY**, but returns the ending position **y2** as the **y** channel,
163163
* for example to position a dot at the top of each element of a stack.
164164
*/
165-
export function stackY2<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;
166165
export function stackY2<T>(options?: T & StackOptions): Transformed<T>;
166+
export function stackY2<T>(stackOptions?: StackOptions, options?: T): Transformed<T>;

src/transforms/window.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ export interface WindowOptions {
108108
*
109109
* If *windowOptions* is a number, it is shorthand for the window size **k**.
110110
*/
111-
export function windowX<T>(windowOptions?: WindowOptions | WindowOptions["k"], options?: T): Transformed<T>;
112111
export function windowX<T>(options?: T & WindowOptions): Transformed<T>;
112+
export function windowX<T>(windowOptions?: WindowOptions | WindowOptions["k"], options?: T): Transformed<T>;
113113

114114
/**
115115
* Groups data into series using the first channel of *z*, *fill*, or *stroke*
@@ -123,8 +123,8 @@ export function windowX<T>(options?: T & WindowOptions): Transformed<T>;
123123
*
124124
* If *windowOptions* is a number, it is shorthand for the window size **k**.
125125
*/
126-
export function windowY<T>(windowOptions?: WindowOptions | WindowOptions["k"], options?: T): Transformed<T>;
127126
export function windowY<T>(options?: T & WindowOptions): Transformed<T>;
127+
export function windowY<T>(windowOptions?: WindowOptions | WindowOptions["k"], options?: T): Transformed<T>;
128128

129129
/**
130130
* Given the specified window *options*, returns a corresponding map

0 commit comments

Comments
 (0)