lebab transform: destruct-param

stripe · May 4, 2019 · b56f52d · b56f52d
1 parent 7eba992
commit b56f52d
Show file tree

Hide file tree

Showing 15 changed files with 143 additions and 139 deletions.
diff --git a/examples/webhook-signing/express.js b/examples/webhook-signing/express.js
@@ -17,13 +17,13 @@ const app = express();
 app.post(
   '/webhooks',
   bodyParser.raw({type: 'application/json'}),
-  (req, res) => {
-    const sig = req.headers['stripe-signature'];
+  ({headers, body}, res) => {
+    const sig = headers['stripe-signature'];
 
     let event;
 
     try {
-      event = stripe.webhooks.constructEvent(req.body, sig, webhookSecret);
+      event = stripe.webhooks.constructEvent(body, sig, webhookSecret);
     } catch (err) {
       // On error, return the error message
       return res.status(400).send(`Webhook Error: ${err.message}`);

diff --git a/lib/StripeMethod.basic.js b/lib/StripeMethod.basic.js
@@ -118,11 +118,11 @@ module.exports = {
 
     return utils.callbackifyPromiseWithTimeout(
       new Promise((resolve, reject) => {
-        this._request('GET', null, path, {}, auth, {}, (err, response) => {
+        this._request('GET', null, path, {}, auth, {}, (err, {metadata}) => {
           if (err) {
             reject(err);
           } else {
-            resolve(response.metadata);
+            resolve(metadata);
           }
         });
       }),

diff --git a/lib/StripeResource.js b/lib/StripeResource.js
@@ -115,7 +115,7 @@ StripeResource.prototype = {
     };
   },
 
-  _responseHandler(req, callback) {
+  _responseHandler({_requestStart, _requestEvent}, callback) {
     const self = this;
     return (res) => {
       let response = '';
@@ -132,14 +132,14 @@ StripeResource.prototype = {
         // lastResponse.
         res.requestId = headers['request-id'];
 
-        const requestDurationMs = Date.now() - req._requestStart;
+        const requestDurationMs = Date.now() - _requestStart;
 
         const responseEvent = utils.removeEmpty({
           api_version: headers['stripe-version'],
           account: headers['stripe-account'],
           idempotency_key: headers['idempotency-key'],
-          method: req._requestEvent.method,
-          path: req._requestEvent.path,
+          method: _requestEvent.method,
+          path: _requestEvent.path,
           status: res.statusCode,
           request_id: res.requestId,
           elapsed: requestDurationMs,
@@ -209,10 +209,10 @@ StripeResource.prototype = {
     }`;
   },
 
-  _errorHandler(req, requestRetries, callback) {
+  _errorHandler({_isAborted}, requestRetries, callback) {
     const self = this;
     return (error) => {
-      if (req._isAborted) {
+      if (_isAborted) {
         // already handled
         return;
       }

diff --git a/lib/autoPagination.js b/lib/autoPagination.js
@@ -138,9 +138,9 @@ function getItemCallback(args) {
   };
 }
 
-function getLastId(listResult) {
-  const lastIdx = listResult.data.length - 1;
-  const lastItem = listResult.data[lastIdx];
+function getLastId({data}) {
+  const lastIdx = data.length - 1;
+  const lastItem = data[lastIdx];
   const lastId = lastItem && lastItem.id;
   if (!lastId) {
     throw Error(
@@ -215,13 +215,13 @@ function makeAutoPagingToArray(autoPagingEach) {
 
 function wrapAsyncIteratorWithCallback(asyncIteratorNext, onItem) {
   return new Promise((resolve, reject) => {
-    function handleIteration(iterResult) {
-      if (iterResult.done) {
+    function handleIteration({done, value}) {
+      if (done) {
         resolve();
         return;
       }
 
-      const item = iterResult.value;
+      const item = value;
       return new Promise((next) => {
         // Bit confusing, perhaps; we pass a `resolve` fn
         // to the user, so they can decide when and if to continue.

diff --git a/lib/resources/EphemeralKeys.js b/lib/resources/EphemeralKeys.js
@@ -6,8 +6,8 @@ const stripeMethod = StripeResource.method;
 module.exports = StripeResource.extend({
   create: stripeMethod({
     method: 'POST',
-    validator(data, options) {
-      if (!options.headers || !options.headers['Stripe-Version']) {
+    validator(data, {headers}) {
+      if (!headers || !headers['Stripe-Version']) {
         throw new Error(
           'stripe_version must be specified to create an ephemeral key'
         );

diff --git a/lib/resources/Files.js b/lib/resources/Files.js
@@ -46,10 +46,10 @@ module.exports = StripeResource.extend({
     function streamError(callback) {
       const StreamProcessingError = Error.extend({
         type: 'StreamProcessingError',
-        populate(raw) {
+        populate({message, detail}) {
           this.type = this.type;
-          this.message = raw.message;
-          this.detail = raw.detail;
+          this.message = message;
+          this.detail = detail;
         },
       });
       return (error) => {

diff --git a/lib/resources/Invoices.js b/lib/resources/Invoices.js
@@ -34,45 +34,42 @@ module.exports = StripeResource.extend({
 
   retrieveUpcoming: stripeMethod({
     method: 'GET',
-    path(urlData) {
+    path({invoiceOptionsOrCustomerId, invoiceOptionsOrSubscriptionId}) {
       let url = 'upcoming?';
       let hasParam = false;
 
       // If you pass just a hash with the relevant parameters, including customer id inside.
       if (
-        urlData.invoiceOptionsOrCustomerId &&
-        typeof urlData.invoiceOptionsOrCustomerId === 'object'
+        invoiceOptionsOrCustomerId &&
+        typeof invoiceOptionsOrCustomerId === 'object'
       ) {
-        return (
-          url + utils.stringifyRequestData(urlData.invoiceOptionsOrCustomerId)
-        );
+        return url + utils.stringifyRequestData(invoiceOptionsOrCustomerId);
       }
 
       // Legacy implementation where the first parameter is a customer id as a string
       if (
-        urlData.invoiceOptionsOrCustomerId &&
-        typeof urlData.invoiceOptionsOrCustomerId === 'string'
+        invoiceOptionsOrCustomerId &&
+        typeof invoiceOptionsOrCustomerId === 'string'
       ) {
-        url = `${url}customer=${urlData.invoiceOptionsOrCustomerId}`;
+        url = `${url}customer=${invoiceOptionsOrCustomerId}`;
         hasParam = true;
       }
 
       // Legacy support where second argument is the subscription id
       if (
-        urlData.invoiceOptionsOrSubscriptionId &&
-        typeof urlData.invoiceOptionsOrSubscriptionId === 'string'
+        invoiceOptionsOrSubscriptionId &&
+        typeof invoiceOptionsOrSubscriptionId === 'string'
       ) {
-        return `${url + (hasParam ? '&' : '')}subscription=${
-          urlData.invoiceOptionsOrSubscriptionId
-        }`;
+        return `${url +
+          (hasParam ? '&' : '')}subscription=${invoiceOptionsOrSubscriptionId}`;
       } else if (
-        urlData.invoiceOptionsOrSubscriptionId &&
-        typeof urlData.invoiceOptionsOrSubscriptionId === 'object'
+        invoiceOptionsOrSubscriptionId &&
+        typeof invoiceOptionsOrSubscriptionId === 'object'
       ) {
         return (
           url +
           (hasParam ? '&' : '') +
-          utils.stringifyRequestData(urlData.invoiceOptionsOrSubscriptionId)
+          utils.stringifyRequestData(invoiceOptionsOrSubscriptionId)
         );
       }
       return url;

diff --git a/lib/utils.js b/lib/utils.js
@@ -217,9 +217,9 @@ const utils = (module.exports = {
    * Determine if file data is a derivative of EventEmitter class.
    * https://nodejs.org/api/events.html#events_events
    */
-  checkForStream(obj) {
-    if (obj.file && obj.file.data) {
-      return obj.file.data instanceof EventEmitter;
+  checkForStream({file}) {
+    if (file && file.data) {
+      return file.data instanceof EventEmitter;
     }
     return false;
   },

diff --git a/test/StripeResource.spec.js b/test/StripeResource.spec.js
@@ -139,8 +139,8 @@ describe('StripeResource', () => {
           .post(options.path, options.params)
           .replyWithError('bad stuff');
 
-        realStripe.charges.create(options.data, (err) => {
-          expect(err.detail.message).to.deep.equal('bad stuff');
+        realStripe.charges.create(options.data, ({detail}) => {
+          expect(detail.message).to.deep.equal('bad stuff');
           done();
         });
       });
@@ -154,12 +154,12 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.charges.create(options.data, (err) => {
+        realStripe.charges.create(options.data, ({message, detail}) => {
           const errorMessage = realStripe.invoices._generateConnectionErrorMessage(
             1
           );
-          expect(err.message).to.equal(errorMessage);
-          expect(err.detail.message).to.deep.equal('worse stuff');
+          expect(message).to.equal(errorMessage);
+          expect(detail.message).to.deep.equal('worse stuff');
           done();
         });
       });
@@ -177,8 +177,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(2);
 
-        realStripe.charges.create(options.data, (err, charge) => {
-          expect(charge.id).to.equal('ch_123');
+        realStripe.charges.create(options.data, (err, {id}) => {
+          expect(id).to.equal('ch_123');
           done();
         });
       });
@@ -200,8 +200,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.charges.create(options.data, (err, charge) => {
-          expect(charge.id).to.equal('ch_123');
+        realStripe.charges.create(options.data, (err, {id}) => {
+          expect(id).to.equal('ch_123');
           done();
         });
       });
@@ -217,8 +217,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.charges.create(options.data, (err) => {
-          expect(err.type).to.equal('StripeCardError');
+        realStripe.charges.create(options.data, ({type}) => {
+          expect(type).to.equal('StripeCardError');
           done();
         });
       });
@@ -234,8 +234,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.charges.create(options.data, (err) => {
-          expect(err.type).to.equal('StripeAPIError');
+        realStripe.charges.create(options.data, ({type}) => {
+          expect(type).to.equal('StripeAPIError');
           done();
         });
       });
@@ -251,8 +251,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.oauth.token(options.data, (err) => {
-          expect(err.type).to.equal('StripeInvalidGrantError');
+        realStripe.oauth.token(options.data, ({type}) => {
+          expect(type).to.equal('StripeInvalidGrantError');
           done();
         });
       });
@@ -274,8 +274,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.charges.create(options.data, (err, charge) => {
-          expect(charge.id).to.equal('ch_123');
+        realStripe.charges.create(options.data, (err, {id}) => {
+          expect(id).to.equal('ch_123');
           done();
         });
       });
@@ -297,8 +297,8 @@ describe('StripeResource', () => {
 
         realStripe.setMaxNetworkRetries(1);
 
-        realStripe.charges.retrieve('ch_123', (err, charge) => {
-          expect(charge.id).to.equal('ch_123');
+        realStripe.charges.retrieve('ch_123', (err, {id}) => {
+          expect(id).to.equal('ch_123');
           done();
         });
       });