chore(new-builder): Merge master

Author: taylorjdawson

dist/web3data.min.js

@@ -1942,7 +1942,7 @@
 
   var v5 = v35('v5', 0x50, sha1Browser);
 
-  const { ETH_METHODS } = constants;
+  const {ETH_METHODS} = constants;
 
   /**
    * Builds the endpoint url to pass to .rawQuery(). Checks for non empties and appends
@@ -1996,16 +1996,29 @@
 
   const throwNow = message => throwIf(true, message);
 
-  const onFulfilled = response =>
-    response.error ? throwNow(response.message) : response.payload;
-  const onError = error => throwNow(error.response.data.message);
+  /**
+   * Handler for all request responses.
+   *
+   * @param response - The Axios response object.
+   * @returns The data from the response.
+   * @private
+   * @example
+   */
+  const onFulfilled = function(response) {
+    throwIf(response.error, response.message);
+    return this && this.formatter
+      ? this.formatter(response.payload)
+      : response.payload
+  };
+
+  const onError = ({response: {data}}) =>
+    throwNow(data.message || data.description);
 
   const rejectPromiseIf = (condition, message) => {
     if (condition) return Promise.reject(new Error(message))
   };
 
   const is = () => {};
-
   is.string = value => typeof value === 'string';
   is.bool = value => typeof value === 'boolean';
   is.emptyString = value => is.string(value) && value.length === 0;
@@ -2014,18 +2027,20 @@
     Object.prototype.hasOwnProperty.call(object, property);
   is.undefined = value => typeof value === 'undefined';
   is.null = value => value === null;
-
   is.notHash = hash => is.undefined(hash) || is.emptyString(hash);
   is.notUndefined = value => !is.undefined(value);
   is.nonEmptyObject = object => !is.emptyObject(object);
   is.nonEmptyString = value => !is.emptyString(value);
   is.notInObject = (object, property) => !is.inObject(object, property);
 
   /**
-   * Generates a uuid see [this gist]() for more details
+   * Generates a uuid see [this gist]() for more details.
+   *
    * @param data
+   * @example
    */
-  const uuid = data => v5(JSON.stringify(data), 'ccfeca02-f0e9-4433-a740-b830cceb3d2d');
+  const uuid = data =>
+    v5(JSON.stringify(data), 'ccfeca02-f0e9-4433-a740-b830cceb3d2d');
 
   /**
    * Returns an array of methods defined on the object.
@@ -2114,6 +2129,12 @@
     })
   };
 
+  const defaultFormatter = (response, field) => {
+    return response[field] ? response[field] : null
+  };
+
+  const recordsFormatter = response => defaultFormatter(response, 'records');
+
   var utils$1 = {
     buildFilterUrl,
     is,
@@ -2127,7 +2148,8 @@
     onFulfilled,
     onError,
     formatJsonRpc,
-    getMethods
+    getMethods,
+    recordsFormatter
   };
 
   const {
@@ -2738,7 +2760,14 @@
     ERROR_MESSAGE_BLOCK_NO_ID: NO_BLOCK_ID
   } = constants;
 
-  const {is: is$5, get: get$5, throwIf: throwIf$2, onFulfilled: onFulfilled$4, onError: onError$4} = utils$1;
+  const {
+    is: is$5,
+    get: get$5,
+    throwIf: throwIf$2,
+    onFulfilled: onFulfilled$4,
+    onError: onError$4,
+    recordsFormatter: recordsFormatter$1
+  } = utils$1;
 
   class Block {
     constructor(web3data) {
@@ -2750,7 +2779,7 @@
       return get$5(this.web3data, {
         endpoint: ENDPOINT$4,
         filterOptions
-      }).then(onFulfilled$4, onError$4)
+      }).then(onFulfilled$4.bind({formatter: recordsFormatter$1}), onError$4)
     }
 
     /**
@@ -2770,108 +2799,100 @@
       }).then(onFulfilled$4, onError$4)
     }
 
-    async getBlockNumber() {
-      const block = await this.web3data.block.getBlock('latest');
-      throwIf$2(block | !block.number, 'Failed to retrieve block number.');
-      return parseInt(block.number, 10)
+    getBlockNumber() {
+      return this.web3data.block.getBlock('latest').then(block => {
+        throwIf$2(block | !block.number, 'Failed to retrieve block number.');
+        return parseInt(block.number, 10)
+      })
     }
 
-    async getBlockTransactionCount(id) {
-      const block = await this.web3data.block.getBlock(id);
-      throwIf$2(
-        !block || (!block.predictions && !block.numTransactions),
-        'Failed to retrieve block transaction count.'
-      );
-      return block.predictions ? null : parseInt(block.numTransactions, 10)
+    getBlockTransactionCount(id) {
+      return this.web3data.block.getBlock(id).then(block => {
+        throwIf$2(
+          !block || (!block.predictions && !block.numTransactions),
+          'Failed to retrieve block transaction count.'
+        );
+        // If 'predictions' field exists then it's a future block thus has no txns
+        return block.predictions ? null : parseInt(block.numTransactions, 10)
+      })
     }
 
-    async getTransactions(id, filterOptions) {
-      const response = await get$5(this.web3data, {
+    getTransactions(id, filterOptions) {
+      throwIf$2(is$5.undefined(id), NO_BLOCK_ID);
+      return get$5(this.web3data, {
         pathParam: id,
         endpoint: ENDPOINT$4,
         subendpoint: 'transactions',
         filterOptions
-      });
-      throwIf$2(
-        !response ||
-          response.status !== 200 ||
-          !response.payload ||
-          !response.payload.records,
-        'Failed to retrieve transactions.'
-      );
-      return response.payload.records
+      }).then(onFulfilled$4.bind({formatter: recordsFormatter$1}), onError$4)
     }
 
-    async getTransactionFromBlock(id, index) {
-      const transactions = await this.web3data.block.getTransactions(id);
-      return new Promise((resolve, reject) => {
-        if (!transactions) {
-          reject(new Error(`Failed to retrieve transaction.`));
-        } else if (index < transactions.length && index > -1) {
-          resolve(transactions[index]);
-        } else {
-          resolve(null);
-        }
+    getTransactionFromBlock(id, index) {
+      throwIf$2(is$5.undefined(id), NO_BLOCK_ID);
+      return this.web3data.block.getTransactions(id).then(txns => {
+        throwIf$2(!txns, 'Failed to retrieve transaction.');
+
+        // Check that 'index' is within valid range
+        return index < txns.length && index > -1 ? txns[index] : null
       })
     }
 
-    async getUncle(id, index) {
-      const block = await this.web3data.block.getBlock(id, {
-        validationMethod: 'full'
-      });
-      return new Promise((resolve, reject) => {
-        if (
-          !block ||
-          (!block.predictions && !block.numTransactions && !block.validation)
-        ) {
-          reject(new Error(`Failed to retrieve uncle.`));
-        } else if (block.predictions || !block.validation.uncles) {
-          resolve(null);
-        } else if (index < block.validation.uncles.length && index > -1) {
-          resolve(block.validation.uncles[index]);
-        } else {
-          resolve(null);
-        }
-      })
+    getUncle(id, index) {
+      throwIf$2(is$5.undefined(id), NO_BLOCK_ID);
+      throwIf$2(is$5.undefined(index), "Missing required param 'index'");
+      return this.web3data.block
+        .getBlock(id, {
+          validationMethod: 'full'
+        })
+        .then(block => {
+          throwIf$2(
+            !block ||
+              (!block.predictions && !block.numTransactions && !block.validation),
+            'Failed to retrieve uncle.'
+          );
+          // Check that it's...
+          // a not a future block
+          // and that the block has uncles
+          // and 'index' is within the valid range
+          return !block.predictions &&
+            block.validation.uncles &&
+            index < block.validation.uncles.length &&
+            index > -1
+            ? block.validation.uncles[index]
+            : null
+        })
     }
 
     getTokenTransfers(id, filterOptions) {
-      if (is$5.undefined(id)) return Promise.reject(new Error(NO_BLOCK_ID))
+      throwIf$2(is$5.undefined(id), NO_BLOCK_ID);
       return get$5(this.web3data, {
         pathParam: id,
         endpoint: ENDPOINT$4,
         subendpoint: 'token-transfers',
         filterOptions
-      }).then(
-        response =>
-          response.error ? throwIf$2(true, response.message) : response.payload,
-        error => throwIf$2(true, error.response.data.message)
-      )
+      }).then(onFulfilled$4, onError$4)
     }
 
-    // TODO: Needs tests
     getLogs(id, filterOptions) {
-      throwIf$2(is$5.notHash(id), NO_BLOCK_ID);
+      throwIf$2(is$5.undefined(id), NO_BLOCK_ID);
       return get$5(this.web3data, {
-        id,
+        pathParam: id,
         endpoint: ENDPOINT$4,
         subendpoint: 'logs',
         filterOptions
-      }).then(onFulfilled$4, onError$4)
+      }).then(onFulfilled$4.bind({formatter: recordsFormatter$1}), onError$4)
     }
 
-    // TODO: Needs tests
     getFunctions(id, filterOptions) {
-      throwIf$2(is$5.notHash(id), NO_BLOCK_ID);
+      throwIf$2(is$5.undefined(id), NO_BLOCK_ID);
       return get$5(this.web3data, {
-        id,
+        pathParam: id,
         endpoint: ENDPOINT$4,
         subendpoint: 'functions',
         filterOptions
-      }).then(onFulfilled$4, onError$4)
+      }).then(onFulfilled$4.bind({formatter: recordsFormatter$1}), onError$4)
     }
 
-    // TODO: Needs tests
     getMetrics(filterOptions) {
       return get$5(this.web3data, {
         endpoint: ENDPOINT$4,
@@ -3736,7 +3757,6 @@
      *
      * @param data - The parsed json data sent from the server.
      * @private
-     * @ignore
      * @example
      */
     _subHandler(data) {

dist/web3data.min.js.map

@@ -1,4 +1,4 @@
-# [web3data-js](https://github.com/web3data/web3data-js#readme) *0.5.14*
+# [web3data-js](https://github.com/web3data/web3data-js#readme) *0.5.15*
 
 > A javascript wrapper for accessing amberdata's public API.
 
@@ -1063,6 +1063,39 @@ the appropriate parameter(s) where applicable.
 
 
 
+#### uuid(data)
+
+
+Generates a uuid see [this gist]() for more details.
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| data |  |  |   |
+
+
+
+
+##### Examples
+
+```javascript
+
+```
+
+
+##### Returns
+
+
+- `Void`
+
+
+
+
+
 ### src/web3data.js
 
 

docs/api.md

@@ -1,6 +1,6 @@
 {
   "name": "web3data-js",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "description": "A javascript wrapper for accessing amberdata's public API.",
   "main": "index.js",
   "browser": "dist/web3data.min.js",

package.json

@@ -4,7 +4,9 @@ import json from 'rollup-plugin-json'
 import builtins from 'rollup-plugin-node-builtins'
 import globals from 'rollup-plugin-node-globals'
 import filesize from 'rollup-plugin-filesize'
-import pkg from './package'
+
+// eslint-disable-next-line import/extensions
+import pkg from './package.json'
 
 export default {
   input: 'index.js',