fix(types): fix signatures of listing methods (#703)

googleapis · May 7, 2019 · 42937a8 · 42937a8
1 parent ada995e
commit 42937a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/bucket.ts b/src/bucket.ts
@@ -68,6 +68,7 @@ interface BucketOptions {
   userProject?: string;
 }
 
+export type GetFilesResponse = [File[], {}, Metadata];
 export interface GetFilesCallback {
   (
     err: Error | null,
@@ -1899,7 +1900,7 @@ class Bucket extends ServiceObject {
     return new File(this, name, options);
   }
 
-  getFiles(query?: GetFilesOptions): Promise<[File[]]>;
+  getFiles(query?: GetFilesOptions): Promise<GetFilesResponse>;
   getFiles(query: GetFilesOptions, callback: GetFilesCallback): void;
   getFiles(callback: GetFilesCallback): void;
   /**
@@ -2007,7 +2008,7 @@ class Bucket extends ServiceObject {
   getFiles(
     queryOrCallback?: GetFilesOptions | GetFilesCallback,
     callback?: GetFilesCallback
-  ): void | Promise<[File[]]> {
+  ): void | Promise<GetFilesResponse> {
     let query = typeof queryOrCallback === 'object' ? queryOrCallback : {};
     if (!callback) {
       callback = queryOrCallback as GetFilesCallback;

diff --git a/src/index.ts b/src/index.ts
@@ -97,6 +97,7 @@ export {
   GetBucketResponse,
   GetFilesCallback,
   GetFilesOptions,
+  GetFilesResponse,
   GetLabelsCallback,
   GetLabelsOptions,
   GetLabelsResponse,

diff --git a/src/storage.ts b/src/storage.ts
@@ -75,9 +75,14 @@ export interface BucketCallback {
   (err: Error | null, bucket?: Bucket | null, apiResponse?: Metadata): void;
 }
 
-export type GetBucketsResponse = [Bucket[]];
+export type GetBucketsResponse = [Bucket[], {}, Metadata];
 export interface GetBucketsCallback {
-  (err: Error | null, buckets: Bucket[]): void;
+  (
+    err: Error | null,
+    buckets: Bucket[],
+    nextQuery?: {},
+    apiResponse?: Metadata
+  ): void;
 }
 export interface GetBucketsRequest {
   prefix?: string;