Skip to content

Commit 42937a8

Browse files
AVaksmanJustinBeckwith
authored andcommitted
fix(types): fix signatures of listing methods (#703)
1 parent ada995e commit 42937a8

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/bucket.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ interface BucketOptions {
6868
userProject?: string;
6969
}
7070

71+
export type GetFilesResponse = [File[], {}, Metadata];
7172
export interface GetFilesCallback {
7273
(
7374
err: Error | null,
@@ -1899,7 +1900,7 @@ class Bucket extends ServiceObject {
18991900
return new File(this, name, options);
19001901
}
19011902

1902-
getFiles(query?: GetFilesOptions): Promise<[File[]]>;
1903+
getFiles(query?: GetFilesOptions): Promise<GetFilesResponse>;
19031904
getFiles(query: GetFilesOptions, callback: GetFilesCallback): void;
19041905
getFiles(callback: GetFilesCallback): void;
19051906
/**
@@ -2007,7 +2008,7 @@ class Bucket extends ServiceObject {
20072008
getFiles(
20082009
queryOrCallback?: GetFilesOptions | GetFilesCallback,
20092010
callback?: GetFilesCallback
2010-
): void | Promise<[File[]]> {
2011+
): void | Promise<GetFilesResponse> {
20112012
let query = typeof queryOrCallback === 'object' ? queryOrCallback : {};
20122013
if (!callback) {
20132014
callback = queryOrCallback as GetFilesCallback;

src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ export {
9797
GetBucketResponse,
9898
GetFilesCallback,
9999
GetFilesOptions,
100+
GetFilesResponse,
100101
GetLabelsCallback,
101102
GetLabelsOptions,
102103
GetLabelsResponse,

src/storage.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,14 @@ export interface BucketCallback {
7575
(err: Error | null, bucket?: Bucket | null, apiResponse?: Metadata): void;
7676
}
7777

78-
export type GetBucketsResponse = [Bucket[]];
78+
export type GetBucketsResponse = [Bucket[], {}, Metadata];
7979
export interface GetBucketsCallback {
80-
(err: Error | null, buckets: Bucket[]): void;
80+
(
81+
err: Error | null,
82+
buckets: Bucket[],
83+
nextQuery?: {},
84+
apiResponse?: Metadata
85+
): void;
8186
}
8287
export interface GetBucketsRequest {
8388
prefix?: string;

0 commit comments

Comments
 (0)