Skip to content

Commit c8b3a47

Browse files
committed
fix(types): update return types of QueryOperator methods to remove Builder option
1 parent 5171a38 commit c8b3a47

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

index.d.ts

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,35 +229,48 @@ export declare class QueryOperator extends Query {
229229

230230
explain(operator: OperatorType): Promise<ExplainResult[]>;
231231

232-
select<T>(...attrs: string[]): Promise<T[] | Builder>;
232+
select<T extends Object>(...attrs: string[]): Promise<T[]>;
233+
select<T extends Object>(...attrs: string[]): Promise<Builder>;
233234

234-
find<T>(): Promise<T | Builder>;
235+
find<T extends Object>(): Promise<T>;
236+
find<T extends Object>(): Promise<Builder>;
235237

236-
count(): Promise<number | Builder>;
238+
count(): Promise<number>;
239+
count(): Promise<Builder>;
237240

238241
/**
239242
* increment a column value
240243
* @param attr
241244
* @param increment default is 1
242245
*/
243-
incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult | Builder>;
246+
incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult>;
247+
incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<Builder>;
244248

245-
delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult | Builder>;
249+
delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
250+
delete(id?: number, index_field_name?: string): Promise<Builder>;
246251

247-
update(row?: any): Promise<MySQLQueryResult | Builder>;
252+
update(row?: any): Promise<MySQLQueryResult>;
253+
update(row?: any): Promise<Builder>;
248254

249-
update<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
255+
update<T extends Object>(row?: T): Promise<MySQLQueryResult>;
256+
update<T extends Object>(row?: T): Promise<Builder>;
250257

251-
insert(row?: any): Promise<MySQLQueryResult | Builder>;
258+
insert(row?: any): Promise<MySQLQueryResult>;
259+
insert(row?: any): Promise<Builder>;
252260

253-
insert<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
261+
insert<T extends Object>(row?: T): Promise<MySQLQueryResult>;
262+
insert<T extends Object>(row?: T): Promise<Builder>;
254263

255-
insertAll(rows: any[]): Promise<MySQLQueryResult[] | Builder>;
264+
insertAll(rows: any[]): Promise<MySQLQueryResult[]>;
265+
insertAll(rows: any[]): Promise<Builder>;
256266

257-
insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[] | Builder>;
267+
insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[]>;
268+
insertAll<T extends Object>(rows: T[]): Promise<Builder>;
258269

259-
upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult | Builder>;
270+
upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult>;
271+
upsertRow(row: any, condition: QueryCondition): Promise<Builder>;
260272

273+
upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
261274
upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult | Builder>;
262275

263276
notExec(): this;

0 commit comments

Comments
 (0)