restql 1.1.6 → 1.1.7

package/dist/cjs/index.js

@@ -1,157 +1,15 @@
 'use strict';
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+var cloneDeep = require('lodash/cloneDeep');
+var merge = require('lodash/merge');
+var axios = require('axios');
+var md5 = require('md5');
+var isURL = require('validator/lib/isURL');
 
-var _regeneratorRuntime = _interopDefault(require('babel-runtime/regenerator'));
-var cloneDeep = _interopDefault(require('lodash/cloneDeep'));
-var merge = _interopDefault(require('lodash/merge'));
-var axios = _interopDefault(require('axios'));
-var md5 = _interopDefault(require('md5'));
-var UrlRegex = _interopDefault(require('url-regex'));
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
-  return typeof obj;
-} : function (obj) {
-  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-};
-
-
-
-
-
-
-
-
-
-var asyncToGenerator = function (fn) {
-  return function () {
-    var gen = fn.apply(this, arguments);
-    return new Promise(function (resolve, reject) {
-      function step(key, arg) {
-        try {
-          var info = gen[key](arg);
-          var value = info.value;
-        } catch (error) {
-          reject(error);
-          return;
-        }
-
-        if (info.done) {
-          resolve(value);
-        } else {
-          return Promise.resolve(value).then(function (value) {
-            step("next", value);
-          }, function (err) {
-            step("throw", err);
-          });
-        }
-      }
-
-      return step("next");
-    });
-  };
-};
-
-
-
-
-
-
-
-
-
-var defineProperty = function (obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-};
-
-var _extends = Object.assign || function (target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i];
-
-    for (var key in source) {
-      if (Object.prototype.hasOwnProperty.call(source, key)) {
-        target[key] = source[key];
-      }
-    }
-  }
-
-  return target;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var slicedToArray = function () {
-  function sliceIterator(arr, i) {
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _e = undefined;
-
-    try {
-      for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-        _arr.push(_s.value);
-
-        if (i && _arr.length === i) break;
-      }
-    } catch (err) {
-      _d = true;
-      _e = err;
-    } finally {
-      try {
-        if (!_n && _i["return"]) _i["return"]();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-
-    return _arr;
-  }
-
-  return function (arr, i) {
-    if (Array.isArray(arr)) {
-      return arr;
-    } else if (Symbol.iterator in Object(arr)) {
-      return sliceIterator(arr, i);
-    } else {
-      throw new TypeError("Invalid attempt to destructure non-iterable instance");
-    }
-  };
-}();
-
-// External Packages
 /**
  * @constant {Object} responses The responses to cache.
  */
-var responses = {};
+const responses = {};
 
 /**
  * Fetches a resource based on its options, if not cached.
@@ -160,46 +18,16 @@ var responses = {};
  * @param {Object} options  The options to bypass.
  * @returns {Promise<Object>} A promise which resolves into an object.
  */
-var fetchResource = (function () {
-  var _ref = asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resource, options) {
-    var key;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            key = md5(resource + '-' + JSON.stringify(options));
-
-
-            if (!(key in responses)) {
-              responses[key] = axios(resource, options).then(function (response) {
-                responses[key] = response;
-
-                return response;
-              });
-            }
-
-            return _context.abrupt('return', responses[key]);
-
-          case 3:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  function fetchResource(_x, _x2) {
-    return _ref.apply(this, arguments);
+async function fetchResource(resource, options) {
+  const key = md5(`${resource}-${JSON.stringify(options)}`);
+  if (!(key in responses)) {
+    responses[key] = axios(resource, options).then(response => {
+      responses[key] = response;
+      return response;
+    });
   }
-
-  return fetchResource;
-})();
-
-// External Packages
-/**
- * @constant {Object} urlRegex The URL regex to test.
- */
-var urlRegex = UrlRegex({ exact: true });
+  return responses[key];
+}
 
 /**
  * Determines whether or not a resource is valid.
@@ -208,28 +36,27 @@ var urlRegex = UrlRegex({ exact: true });
  * @returns {boolean} Whether or not a resource is valid.
  */
 function isResource(resource) {
-  return urlRegex.test(resource);
+  return isURL(resource);
 }
 
 /**
  * @constant {string} PROP_DELIMITER The delimiter of a property.
  */
-var PROP_DELIMITER = '.';
+const PROP_DELIMITER = '.';
 
 /**
  * @constant {RegExp} REGEX_PROP_IS_ARR_IS_OPT Determines whether or not a property is an array and/or is optional.
  */
-var REGEX_PROP_IS_ARR_IS_OPT = /^([^[\]?]+)(\[])?(\?)?$/;
+const REGEX_PROP_IS_ARR_IS_OPT = /^([^[\]?]+)(\[])?(\?)?$/;
 
 /**
  * @constant {Object} constants The constants of the library.
  */
-var constants = Object.freeze({
-  PROP_DELIMITER: PROP_DELIMITER,
-  REGEX_PROP_IS_ARR_IS_OPT: REGEX_PROP_IS_ARR_IS_OPT
+const constants = Object.freeze({
+  PROP_DELIMITER,
+  REGEX_PROP_IS_ARR_IS_OPT
 });
 
-// Internal Packages
 /**
  * Gets the parsed properties from an object.
  *
@@ -239,36 +66,22 @@ var constants = Object.freeze({
  * @throws {RuntimeError} If a property could not be got.
  */
 function objectGet(obj, props) {
-  var nextPropsArr = props.split(constants.PROP_DELIMITER);
-
-  var _ref = constants.REGEX_PROP_IS_ARR_IS_OPT.exec(nextPropsArr.shift()) || [],
-      _ref2 = slicedToArray(_ref, 4),
-      prop = _ref2[1],
-      isArr = _ref2[2],
-      isOpt = _ref2[3];
-
-  var nextProps = nextPropsArr.join(constants.PROP_DELIMITER);
-
+  const nextPropsArr = props.split(constants.PROP_DELIMITER);
+  const [, prop, isArr, isOpt] = constants.REGEX_PROP_IS_ARR_IS_OPT.exec(nextPropsArr.shift()) || [];
+  const nextProps = nextPropsArr.join(constants.PROP_DELIMITER);
   if (!prop) {
     return obj;
   }
-
   if (!(prop in obj)) {
     if (isOpt) {
       return isArr ? [] : null;
     }
-
-    throw new Error('RuntimeError: could not get property `' + prop + '`');
+    throw new Error(`RuntimeError: could not get property \`${prop}\``);
   }
-
-  var nextObjs = obj[prop];
-
-  return isArr ? nextObjs.map(function (nextObj) {
-    return objectGet(nextObj, nextProps);
-  }) : objectGet(nextObjs, nextProps);
+  const nextObjs = obj[prop];
+  return isArr ? nextObjs.map(nextObj => objectGet(nextObj, nextProps)) : objectGet(nextObjs, nextProps);
 }
 
-// Internal Packages
 /**
  * Sets the parsed properties to an object.
  *
@@ -277,26 +90,17 @@ function objectGet(obj, props) {
  * @returns {Object} An object.
  */
 function objectSet(data, props) {
-  var nextPropsArr = props.split(constants.PROP_DELIMITER);
-
-  var _ref = constants.REGEX_PROP_IS_ARR_IS_OPT.exec(nextPropsArr.shift()) || [],
-      _ref2 = slicedToArray(_ref, 3),
-      prop = _ref2[1],
-      isArr = _ref2[2];
-
-  var nextProps = nextPropsArr.join(constants.PROP_DELIMITER);
-
+  const nextPropsArr = props.split(constants.PROP_DELIMITER);
+  const [, prop, isArr] = constants.REGEX_PROP_IS_ARR_IS_OPT.exec(nextPropsArr.shift()) || [];
+  const nextProps = nextPropsArr.join(constants.PROP_DELIMITER);
   if (!prop) {
     return data;
   }
-
-  return defineProperty({}, prop, isArr ? data.map(function (nextData) {
-    return objectSet(nextData, nextProps);
-  }) : objectSet(data, nextProps));
+  return {
+    [prop]: isArr ? data.map(nextData => objectSet(nextData, nextProps)) : objectSet(data, nextProps)
+  };
 }
 
-// External Packages
-// Internal Packages
 /**
  * Resolves the nested-linked resources of a RESTful API.
  *
@@ -307,157 +111,35 @@ function objectSet(data, props) {
  * @throws {InvalidArgumentError} If a resource is invalid.
  * @throws {RuntimeError}         If a resource could not be fetched.
  */
-var resolve = (function () {
-  var _ref = asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resource, resolver, options) {
-    var _this = this;
-
-    var response, obj, resourcesObj, resourcesArr, responses;
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            if (resource) {
-              _context3.next = 2;
-              break;
-            }
-
-            return _context3.abrupt('return', null);
-
-          case 2:
-            if (isResource(resource)) {
-              _context3.next = 4;
-              break;
-            }
-
-            throw new Error('InvalidArgumentError: invalid resource `' + resource + '`');
-
-          case 4:
-            _context3.t0 = cloneDeep;
-            _context3.next = 7;
-            return fetchResource(resource, options);
-
-          case 7:
-            _context3.t1 = _context3.sent;
-            response = (0, _context3.t0)(_context3.t1);
-
-            if (response.config.validateStatus(response.status)) {
-              _context3.next = 11;
-              break;
-            }
-
-            throw new Error('RuntimeError: could not fetch resource `' + resource + '`');
-
-          case 11:
-            obj = response.data;
-
-            if (resolver) {
-              _context3.next = 14;
-              break;
-            }
-
-            return _context3.abrupt('return', obj);
-
-          case 14:
-            resourcesObj = Object.keys(resolver).map(function (props) {
-              return defineProperty({}, props, objectGet(obj, props));
-            });
-            resourcesArr = Object.entries(resourcesObj.reduce(function (result, val) {
-              return _extends({}, result, val);
-            }, {}));
-            _context3.next = 18;
-            return Promise.all(resourcesArr.map(function () {
-              var _ref4 = asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
-                var _ref5 = slicedToArray(_ref3, 2),
-                    props = _ref5[0],
-                    resources = _ref5[1];
-
-                var nextResolver, data;
-                return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        nextResolver = resolver[props];
-
-                        if (!Array.isArray(resources)) {
-                          _context2.next = 7;
-                          break;
-                        }
-
-                        _context2.next = 4;
-                        return Promise.all(resources.map(function () {
-                          var _ref6 = asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(nextResource) {
-                            return _regeneratorRuntime.wrap(function _callee$(_context) {
-                              while (1) {
-                                switch (_context.prev = _context.next) {
-                                  case 0:
-                                    return _context.abrupt('return', resolve(nextResource, nextResolver, options));
-
-                                  case 1:
-                                  case 'end':
-                                    return _context.stop();
-                                }
-                              }
-                            }, _callee, _this);
-                          }));
-
-                          return function (_x5) {
-                            return _ref6.apply(this, arguments);
-                          };
-                        }()));
-
-                      case 4:
-                        _context2.t0 = _context2.sent;
-                        _context2.next = 10;
-                        break;
-
-                      case 7:
-                        _context2.next = 9;
-                        return resolve(resources, nextResolver, options);
-
-                      case 9:
-                        _context2.t0 = _context2.sent;
-
-                      case 10:
-                        data = _context2.t0;
-                        return _context2.abrupt('return', [props, data]);
-
-                      case 12:
-                      case 'end':
-                        return _context2.stop();
-                    }
-                  }
-                }, _callee2, _this);
-              }));
-
-              return function (_x4) {
-                return _ref4.apply(this, arguments);
-              };
-            }()));
-
-          case 18:
-            responses = _context3.sent;
-            return _context3.abrupt('return', responses.reduce(function (result, _ref7) {
-              var _ref8 = slicedToArray(_ref7, 2),
-                  props = _ref8[0],
-                  data = _ref8[1];
-
-              return merge(result, objectSet(data, props));
-            }, obj));
-
-          case 20:
-          case 'end':
-            return _context3.stop();
-        }
-      }
-    }, _callee3, this);
-  }));
-
-  function resolve(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
+async function resolve(resource, resolver, options) {
+  if (!resource) {
+    return null;
   }
-
-  return resolve;
-})();
+  if (!isResource(resource)) {
+    throw new Error(`InvalidArgumentError: invalid resource \`${resource}\``);
+  }
+  const response = cloneDeep(await fetchResource(resource, options));
+  if (!response.config.validateStatus(response.status)) {
+    throw new Error(`RuntimeError: could not fetch resource \`${resource}\``);
+  }
+  const obj = response.data;
+  if (!resolver) {
+    return obj;
+  }
+  const resourcesObj = Object.keys(resolver).map(props => ({
+    [props]: objectGet(obj, props)
+  }));
+  const resourcesArr = Object.entries(resourcesObj.reduce((result, val) => ({
+    ...result,
+    ...val
+  }), {}));
+  const responses = await Promise.all(resourcesArr.map(async ([props, resources]) => {
+    const nextResolver = resolver[props];
+    const data = Array.isArray(resources) ? await Promise.all(resources.map(async nextResource => resolve(nextResource, nextResolver, options))) : await resolve(resources, nextResolver, options);
+    return [props, data];
+  }));
+  return responses.reduce((result, [props, data]) => merge(result, objectSet(data, props)), obj);
+}
 
 /**
  * Determines whether or not an object is valid.
@@ -466,10 +148,9 @@ var resolve = (function () {
  * @returns {boolean} Whether or not an object is valid.
  */
 function isObject(obj) {
-  return obj !== null && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === 'object' && !Array.isArray(obj);
+  return obj !== null && typeof obj === 'object' && !Array.isArray(obj);
 }
 
-// Internal Packages
 /**
  * Determines whether or not a resolver is valid.
  *
@@ -480,21 +161,13 @@ function isResolver(resolver) {
   if (!resolver) {
     return true;
   }
-
-  var keys = Object.keys(resolver);
-
+  const keys = Object.keys(resolver);
   if (!keys.length) {
     return false;
   }
-
-  return keys.map(function (key) {
-    return !key.startsWith(constants.PROP_DELIMITER) && !key.endsWith(constants.PROP_DELIMITER) && isResolver(resolver[key]);
-  }).reduce(function (result, val) {
-    return result && val;
-  }, true);
+  return keys.map(key => !key.startsWith(constants.PROP_DELIMITER) && !key.endsWith(constants.PROP_DELIMITER) && isResolver(resolver[key])).reduce((result, val) => result && val, true);
 }
 
-// Internal Packages
 /**
  * Resolves the nested-linked resources of a RESTful API.
  *
@@ -505,44 +178,14 @@ function isResolver(resolver) {
  * @throws {InvalidArgumentError} If a resolver is invalid.
  * @throws {InvalidArgumentError} If an options are invalid.
  */
-var restql = (function () {
-  var _ref = asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resource, resolver) {
-    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!(!isObject(resolver) || !isResolver(resolver))) {
-              _context.next = 2;
-              break;
-            }
-
-            throw new Error('InvalidArgumentError: invalid resolver `' + JSON.stringify(resolver) + '`');
-
-          case 2:
-            if (isObject(options)) {
-              _context.next = 4;
-              break;
-            }
-
-            throw new Error('InvalidArgumentError: invalid options `' + JSON.stringify(options) + '`');
-
-          case 4:
-            return _context.abrupt('return', resolve(resource, resolver, options));
-
-          case 5:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  function restql(_x2, _x3) {
-    return _ref.apply(this, arguments);
+async function restql(resource, resolver, options = {}) {
+  if (!isObject(resolver) || !isResolver(resolver)) {
+    throw new Error(`InvalidArgumentError: invalid resolver \`${JSON.stringify(resolver)}\``);
   }
-
-  return restql;
-})();
+  if (!isObject(options)) {
+    throw new Error(`InvalidArgumentError: invalid options \`${JSON.stringify(options)}\``);
+  }
+  return resolve(resource, resolver, options);
+}
 
 module.exports = restql;