feat: add promise support

README.md

@@ -111,6 +111,27 @@ urlshortener.url.get(params, (err, response) => {
 });
 ```
 
+You can also use promises:
+
+``` js
+urlshortener.url.get(params)
+  .then(response => {
+    console.log('Long url is', response.data.longUrl);
+  })
+  .catch(error => console.error);
+```
+
+Or async/await:
+
+``` js
+async function runSample() {
+  const response = await urlshortener.url.get(params);
+  console.log('Long url is', response.data.longUrl);
+}
+runSample().catch(console.error);
+```
+
+
 **Example** Updates an email message's labels, using the `resource`
 parameter to specify the request body.
 
@@ -256,7 +277,7 @@ const {google} = require('googleapis');
 const plus = google.plus('v1');
 const OAuth2 = google.auth.OAuth2;
 
-// WARNING: Make sure your CLIENT_SECRET is stored in a safe place.  
+// WARNING: Make sure your CLIENT_SECRET is stored in a safe place.
 const oauth2Client = new OAuth2(
   YOUR_CLIENT_ID,
   YOUR_CLIENT_SECRET,
@@ -420,9 +441,9 @@ This client supports multipart media uploads. The resource parameters are specif
 This example uploads a plain text file to Google Drive with the title "Test" and contents "Hello World".
 
 ``` js
-const drive = google.drive({ 
-  version: 'v3', 
-  auth: oauth2Client 
+const drive = google.drive({
+  version: 'v3',
+  auth: oauth2Client
 });
 
 drive.files.create({
@@ -445,8 +466,8 @@ Note: Your readable stream may be [unstable][stability]. Use at your own risk.
 
 ```js
 const fs = require('fs');
-const drive = google.drive({ 
-  version: 'v3', 
+const drive = google.drive({
+  version: 'v3',
   auth: oauth2Client
 });
 
@@ -565,7 +586,7 @@ google.auth.getApplicationDefault((err, authClient, projectId) => {
   bigquery.datasets.delete(request, (err, response) => {
     if (err) {
       throw err;
-    } 
+    }
     console.log(response.data);
   });
 });

samples/analyticsReporting/batchGet.js

@@ -21,8 +21,8 @@ const analyticsreporting = google.analyticsreporting({
   auth: sampleClient.oAuth2Client
 });
 
-function runSample (callback) {
-  analyticsreporting.reports.batchGet({
+async function runSample () {
+  const res = await analyticsreporting.reports.batchGet({
     resource: {
       reportRequests: [{
         viewId: '65704806',
@@ -42,13 +42,9 @@ function runSample (callback) {
         ]
       }]
     }
-  }, (err, res) => {
-    if (err) {
-      throw err;
-    }
-    console.log(res.data);
-    callback(res.data);
   });
+  console.log(res.data);
+  return res.data;
 }
 
 // if invoked directly (not tests), authenticate and run the samples
@@ -58,7 +54,7 @@ if (module === require.main) {
     if (err) {
       throw err;
     }
-    runSample(() => { /* sample complete */ });
+    runSample().catch(e => console.error);
   });
 }
 

src/apis/abusiveexperiencereport/v1.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import {AxiosPromise} from 'axios';
+
 import {GoogleApis} from '../..';
 import {BodyResponseCallback, GlobalOptions, MethodOptions} from '../../lib/api';
 import {createAPIRequest} from '../../lib/apirequest';
@@ -53,10 +55,15 @@ export class Abusiveexperiencereport {
   constructor(options: GlobalOptions, google: GoogleApis) {
     this._options = options || {};
     this.google = google;
+    this.getRoot.bind(this);
 
     this.sites = new Resource$Sites(this);
     this.violatingSites = new Resource$Violatingsites(this);
   }
+
+  getRoot() {
+    return this.root;
+  }
 }
 
 /**
@@ -106,8 +113,14 @@ export class Resource$Sites {
   root: Abusiveexperiencereport;
   constructor(root: Abusiveexperiencereport) {
     this.root = root;
+    this.getRoot.bind(this);
   }
 
+  getRoot() {
+    return this.root;
+  }
+
+
   /**
    * abusiveexperiencereport.sites.get
    * @desc Gets a summary of the abusive experience rating of a site.
@@ -120,39 +133,58 @@ export class Resource$Sites {
    * @param {callback} callback The callback that handles the response.
    * @return {object} Request object
    */
-  get =
-      (params: any,
-       options: MethodOptions|BodyResponseCallback<Schema$SiteSummaryResponse>,
-       callback?: BodyResponseCallback<Schema$SiteSummaryResponse>) => {
-        if (typeof options === 'function') {
-          callback = options;
-          options = {};
-        }
-        options = options || {};
-        const rootUrl = options.rootUrl ||
-            'https://abusiveexperiencereport.googleapis.com/';
-        const parameters = {
-          options: Object.assign(
-              {
-                url: (rootUrl + '/v1/{name}').replace(/([^:]\/)\/+/g, '$1'),
-                method: 'GET'
-              },
-              options),
-          params,
-          requiredParams: ['name'],
-          pathParams: ['name'],
-          context: this.root
-        };
-        createAPIRequest<Schema$SiteSummaryResponse>(parameters, callback!);
-      };
+  get(params: any,
+      options?: MethodOptions): AxiosPromise<Schema$SiteSummaryResponse>;
+  get(params: any,
+      options: MethodOptions|BodyResponseCallback<Schema$SiteSummaryResponse>,
+      callback?: BodyResponseCallback<Schema$SiteSummaryResponse>): void;
+  get(params: any,
+      options?: MethodOptions|BodyResponseCallback<Schema$SiteSummaryResponse>,
+      callback?: BodyResponseCallback<Schema$SiteSummaryResponse>):
+      void|AxiosPromise<Schema$SiteSummaryResponse> {
+    if (typeof options === 'function') {
+      callback = options;
+      options = {};
+    }
+    if (typeof params === 'function') {
+      callback = params;
+      params = {};
+    }
+    options = options || {};
+    const rootUrl =
+        options.rootUrl || 'https://abusiveexperiencereport.googleapis.com/';
+    const parameters = {
+      options: Object.assign(
+          {
+            url: (rootUrl + '/v1/{name}').replace(/([^:]\/)\/+/g, '$1'),
+            method: 'GET'
+          },
+          options),
+      params,
+      requiredParams: ['name'],
+      pathParams: ['name'],
+      context: this.getRoot()
+    };
+    if (callback) {
+      createAPIRequest<Schema$SiteSummaryResponse>(parameters, callback);
+    } else {
+      return createAPIRequest<Schema$SiteSummaryResponse>(parameters);
+    }
+  }
 }
 
 export class Resource$Violatingsites {
   root: Abusiveexperiencereport;
   constructor(root: Abusiveexperiencereport) {
     this.root = root;
+    this.getRoot.bind(this);
+  }
+
+  getRoot() {
+    return this.root;
   }
 
+
   /**
    * abusiveexperiencereport.violatingSites.list
    * @desc Lists sites with Abusive Experience Report statuses of "Failing".
@@ -164,31 +196,46 @@ export class Resource$Violatingsites {
    * @param {callback} callback The callback that handles the response.
    * @return {object} Request object
    */
-  list =
-      (params: any,
-       options: MethodOptions|
-       BodyResponseCallback<Schema$ViolatingSitesResponse>,
-       callback?: BodyResponseCallback<Schema$ViolatingSitesResponse>) => {
-        if (typeof options === 'function') {
-          callback = options;
-          options = {};
-        }
-        options = options || {};
-        const rootUrl = options.rootUrl ||
-            'https://abusiveexperiencereport.googleapis.com/';
-        const parameters = {
-          options: Object.assign(
-              {
-                url: (rootUrl + '/v1/violatingSites')
-                         .replace(/([^:]\/)\/+/g, '$1'),
-                method: 'GET'
-              },
-              options),
-          params,
-          requiredParams: [],
-          pathParams: [],
-          context: this.root
-        };
-        createAPIRequest<Schema$ViolatingSitesResponse>(parameters, callback!);
-      };
+  list(params: any, options?: MethodOptions):
+      AxiosPromise<Schema$ViolatingSitesResponse>;
+  list(
+      params: any,
+      options: MethodOptions|
+      BodyResponseCallback<Schema$ViolatingSitesResponse>,
+      callback?: BodyResponseCallback<Schema$ViolatingSitesResponse>): void;
+  list(
+      params: any,
+      options?: MethodOptions|
+      BodyResponseCallback<Schema$ViolatingSitesResponse>,
+      callback?: BodyResponseCallback<Schema$ViolatingSitesResponse>):
+      void|AxiosPromise<Schema$ViolatingSitesResponse> {
+    if (typeof options === 'function') {
+      callback = options;
+      options = {};
+    }
+    if (typeof params === 'function') {
+      callback = params;
+      params = {};
+    }
+    options = options || {};
+    const rootUrl =
+        options.rootUrl || 'https://abusiveexperiencereport.googleapis.com/';
+    const parameters = {
+      options: Object.assign(
+          {
+            url: (rootUrl + '/v1/violatingSites').replace(/([^:]\/)\/+/g, '$1'),
+            method: 'GET'
+          },
+          options),
+      params,
+      requiredParams: [],
+      pathParams: [],
+      context: this.getRoot()
+    };
+    if (callback) {
+      createAPIRequest<Schema$ViolatingSitesResponse>(parameters, callback);
+    } else {
+      return createAPIRequest<Schema$ViolatingSitesResponse>(parameters);
+    }
+  }
 }