@livepreso/api 6.46.0 → 6.48.0

package/cjs/models/base.js

@@ -1,34 +1,63 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BaseModel = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _utils = require("../utils.js");
+
 var _api = require("../api.js");
+
 var _ampersandRestCollection = _interopRequireDefault(require("ampersand-rest-collection"));
+
 var _ampersandModel = _interopRequireDefault(require("ampersand-model"));
+
+var _bluebird = _interopRequireDefault(require("bluebird"));
+
 var _superagentBluebirdPromise = _interopRequireDefault(require("superagent-bluebird-promise"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
+
 var _dedentJs = _interopRequireDefault(require("dedent-js"));
+
 var _log = _interopRequireDefault(require("../log.js"));
+
 var _moment = _interopRequireDefault(require("moment"));
+
 var _qs = _interopRequireDefault(require("qs"));
+
 var _stateRegister = require("../state-register.js");
+
 var _sync2 = require("../sync.js");
+
 var _url = _interopRequireDefault(require("url"));
+
 var _templateObject;
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 /**
  * @constructor
  * @alias models.BaseModel
  */
-var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends models.BaseModel# */{
+var BaseModel = _ampersandModel.default.extend(
+/** @lends models.BaseModel# */
+{
   modelName: null,
   queryData: {},
   detailType: "number",
@@ -51,79 +80,92 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   urlMatchKeys: {},
   constructor: function constructor() {
     var _data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
     var options = _lodash.default.defaults(opts, {
       data: {}
     });
+
     var data = _data;
     this._unsetChildren = {};
     this._unsetCollections = {};
     this._expandedValues = {};
+
     if (data === null) {
       data = {};
-    }
+    } // Allow passing in models
+
 
-    // Allow passing in models
     if (data instanceof _ampersandModel.default) {
       data = data.toJSON();
     }
-    this.queryData = options.data;
 
-    // Convert any strings into a url format we can understand
+    this.queryData = options.data; // Convert any strings into a url format we can understand
+
     if (_lodash.default.isString(data)) {
       data = {
         url: data
       };
       this._isFetched = false;
-    }
+    } // Convert model ids into a format we can understand
+
 
-    // Convert model ids into a format we can understand
     if (_lodash.default.isNumber(data)) {
       data = {
         id: data
       };
       this._isFetched = false;
     }
+
     var dataCopy = _lodash.default.extend({}, data);
+
     this._data = dataCopy;
-    this._options = options;
+    this._options = options; // Stop making edits to these affect other models
 
-    // Stop making edits to these affect other models
     this._children = _lodash.default.clone(this._children);
     this._collections = _lodash.default.clone(this._collections);
-    this._definition = _lodash.default.clone(this._definition);
-
-    // Check for specialized url returns from the server. This is for when the
+    this._definition = _lodash.default.clone(this._definition); // Check for specialized url returns from the server. This is for when the
     // server responds with an array of urls rather than object data.
+
     if (dataCopy && typeof dataCopy.url === "string") {
       this._url = dataCopy.url;
     }
+
     for (var key in dataCopy) {
-      var def = dataCopy[key];
-      // Any models/collections passed into the constructor should be
+      var def = dataCopy[key]; // Any models/collections passed into the constructor should be
       // converted to JSON so that it can be parsed
+
       if (def && (def.isState || def instanceof _ampersandRestCollection.default)) {
         dataCopy[key] = def.toJSON();
       }
+
       if (def && Array.isArray(def)) {
         dataCopy[key] = def.map(function (obj) {
           if (obj instanceof _ampersandModel.default) {
             return obj.toJSON();
           }
+
           return obj;
         });
       }
     }
+
     this.registerStates();
+
     this._convertToValues();
+
     var id = this._getIDFromURL(this._url);
+
     if (!dataCopy.id && id) {
       dataCopy.id = id;
     }
+
     _ampersandModel.default.prototype.constructor.call(this, dataCopy, options);
-    this._setDerived();
 
-    // Re-set the values that were previously children or collections
+    this._setDerived(); // Re-set the values that were previously children or collections
+
+
     this._initUnsetValues();
   },
   // If there is a model returned from a derived property, and the model
@@ -131,17 +173,19 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   _setDerived: function _setDerived() {
     for (var _i = 0, _Object$keys = Object.keys(this._derived); _i < _Object$keys.length; _i++) {
       var derivedKey = _Object$keys[_i];
+
       if (!this._data[derivedKey]) {
         continue;
       }
+
       if (this[derivedKey] instanceof _ampersandModel.default) {
         for (var _i2 = 0, _Object$keys2 = Object.keys(this._data[derivedKey]); _i2 < _Object$keys2.length; _i2++) {
           var derivedProp = _Object$keys2[_i2];
           this[derivedKey].set(derivedProp, this._data[derivedKey][derivedProp]);
         }
-      }
+      } // If it's a collection, we can just pass the data straight in
+
 
-      // If it's a collection, we can just pass the data straight in
       if (this[derivedKey] instanceof _ampersandRestCollection.default) {
         this[derivedKey].set(this._data[derivedKey]);
       }
@@ -150,15 +194,19 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   // Internal function. Used by collection as well.
   _matchesURL: function _matchesURL(url) {
     var matchesDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
     if (!this.modelName || this.urlRoot() === _api.Api.getURL()) {
       return false;
     }
+
     var replacements = _lodash.default.extend({}, {
       detailKey: this.detailType
     }, this.urlMatchKeys);
+
     var regexes = Object.keys(replacements).reduce(function (result, key) {
       var type = replacements[key];
       var name = key.replace(/\./g, "_");
+
       if (type === "number") {
         result[name] = "\\d+";
       } else if (type === "uuid") {
@@ -168,45 +216,50 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
       } else {
         throw new Error("Unknown regex type '".concat(type, "'."));
       }
-      return result;
-    }, {});
 
-    // Create a starting regex string with variables. Strips the root url so that it could
+      return result;
+    }, {}); // Create a starting regex string with variables. Strips the root url so that it could
     // be read from any server.
+
     var urlWithoutRoot = this.urlRoot().replace(_api.Api.getURL(), "");
     var urlStructure = urlWithoutRoot.slice();
+
     if (matchesDetail) {
       urlStructure += "{detailKey}/";
-    }
-
-    // Let's test if the url has even a remote chance of matching
+    } // Let's test if the url has even a remote chance of matching
     // the url (like a partial match, any part without variables).
     // If that doesn't match, we can sometimes prevent a nasty log
     // error from being thrown.
+
+
     var split = urlStructure.split("/");
     var argIndex = split.findIndex(function (val) {
       return val.indexOf("{") === 0;
     });
+
     if (argIndex >= 0) {
       var attemptedURLWithoutRoot = url.replace(_api.Api.getURL(), "");
       var partial = split.slice(0, argIndex).join("/");
+
       if (attemptedURLWithoutRoot.indexOf(partial) !== 0) {
         return false;
       }
-    }
+    } // Replace keys with regexes
+
 
-    // Replace keys with regexes
     var interpolatedString;
+
     try {
       interpolatedString = _lodash.default.template(urlStructure.replace(/\./g, "_"), {
         interpolate: /{([\s\S\.]+?)}/g
       })(regexes);
     } catch (e) {
       _log.default.error((0, _dedentJs.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\tFailed to match URL '", "' for model '", "'.\n\t\t\t\tThis is usually because the regex type for a key hasn't been set.\n\t\t\t\tError: "])), url, this.modelName), e);
+
       return false;
-    }
+    } // Convert into a regex and test if url matches
+
 
-    // Convert into a regex and test if url matches
     var baseString = ".*".concat(interpolatedString.replace(/\//m, "/"), "$");
     var re = new RegExp(baseString);
     return re.test(url);
@@ -221,24 +274,29 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   _getIDFromURL: function _getIDFromURL(url) {
     var resource = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
     var resourceURL = resource || this.getResourceURL();
+
     if (!url || !resourceURL) {
       return null;
     }
+
     var urlPath = _url.default.parse(url).path;
-    var resourceURLPath = _url.default.parse(resourceURL).path;
 
-    // Remove the '/api' if present
+    var resourceURLPath = _url.default.parse(resourceURL).path; // Remove the '/api' if present
+
+
     var resourceEnd = resourceURLPath.split("/api").join("");
-    var urlEnd = urlPath.split("/api").join("");
+    var urlEnd = urlPath.split("/api").join(""); // If they are the same, there is no id at the end
 
-    // If they are the same, there is no id at the end
     if (!urlEnd || urlEnd === resourceEnd) {
       return null;
     }
+
     var idStr = urlEnd.split(resourceEnd).join("");
+
     if ((idStr.match(/\//g) || []).length === 1) {
       return parseInt(idStr.slice(0, -1), 10);
     }
+
     return null;
   },
   // Public version for details only
@@ -257,9 +315,11 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
         if (typeof currentVal === "undefined") {
           return false;
         }
+
         if (currentVal || newVal) {
           return (0, _moment.default)(currentVal).isSame((0, _moment.default)(newVal));
         }
+
         return currentVal !== newVal;
       }
     },
@@ -283,6 +343,7 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
       }
     }
   },
+
   /**
    * @property {number} [id]
    */
@@ -292,6 +353,7 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
       required: false
     }
   },
+
   /*
    * Overridable serialization for sending data to
    * the server
@@ -301,23 +363,29 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   },
   _registerChildModel: function _registerChildModel(states, prop, model) {
     var Model = _stateRegister.registeredStates[model];
+
     if (!Model) {
       throw new Error("'".concat(model, "' not found! Did you forget to import it on the '").concat(this.modelName, "' model?"));
     }
+
     this._children[prop] = Model;
   },
   _registerCollection: function _registerCollection(state, prop, collection) {
     var Collection = state[collection];
+
     if (!Collection) {
       throw new Error("'".concat(collection, "' not found! Did you forget to import it on the '").concat(this.modelName, "' model?"));
     }
+
     this._collections[prop] = Collection;
   },
+
   /*
    * Replace strings respresenting a registered model/collection the function
    */
   registerStates: function registerStates() {
     var _this = this;
+
     // Loop through children and replace any parent objects directly to stop
     // maximum stack overflows
     _lodash.default.each(this._children, function (model, prop) {
@@ -325,10 +393,9 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
         if (_this._options.parent && model === _this._options.parent._registerName) {
           // This part is important, if the link stays when there's a circular dependency,
           // this will continue forever.
-          delete _this._children[prop];
-
-          // Can be a string or an object so we use "any". We add the definition
+          delete _this._children[prop]; // Can be a string or an object so we use "any". We add the definition
           // so that we can retrieve this value later.
+
           _this._definition[prop] = {
             type: "any"
           };
@@ -337,9 +404,9 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
           _this._registerChildModel(_stateRegister.registeredStates, prop, model);
         }
       }
-    }, this);
+    }, this); // Loop throught the collections and replace with the registered collection
+
 
-    // Loop throught the collections and replace with the registered collection
     _lodash.default.each(this._collections, function (collection, prop) {
       if (typeof collection === "string") {
         _this._registerCollection(_stateRegister.registeredStates, prop, collection);
@@ -348,14 +415,15 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   },
   _updateResponse: function _updateResponse(response) {
     var _this2 = this;
+
     this._data = response || {};
+
     if (!response) {
       return;
-    }
-
-    // Set previously-initialised children & collections with new
+    } // Set previously-initialised children & collections with new
     // data retrieved during the fetch
 
+
     Object.keys(this._children).forEach(function (key) {
       if (response[key]) {
         _this2[key] = response[key];
@@ -369,33 +437,41 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   },
   save: function save() {
     var _this3 = this;
+
     return _ampersandModel.default.prototype.save.apply(this, arguments).tap(function (response) {
       _this3._updateResponse(response);
     });
   },
   fetch: function fetch() {
     var _this4 = this;
+
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     if (options.url) {
       this._url = options.url;
     }
+
     this._options = _lodash.default.extend({}, this._options, options);
     this.isFetching = true;
     return _ampersandModel.default.prototype.fetch.apply(this, arguments).tap(function (response) {
       _this4._isFetched = true;
       _this4.isFetching = false;
+
       _this4._updateResponse(response);
     });
   },
   options: function options() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     if (options.url) {
       this._url = options.url;
     }
+
     return (0, _superagentBluebirdPromise.default)("OPTIONS", this.url()).set(BaseModel.Auth.headers).then(function (res) {
       if (res.body && res.body.actions) {
         return res.body.actions;
       }
+
       return null;
     });
   },
@@ -404,11 +480,15 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   },
   getSafeAttrs: function getSafeAttrs(key) {
     var _this5 = this;
+
     if (!_lodash.default.isUndefined(key)) {
       return !_lodash.default.isUndefined(this._expandedValues[key]) ? this._expandedValues[key] : this._values[key];
     }
+
     var attrs = {};
+
     var keys = _lodash.default.uniq(_lodash.default.concat(_lodash.default.concat(Object.keys(this._unsetChildren), Object.keys(this._unsetCollections)), Object.keys(this._values)));
+
     keys.forEach(function (key) {
       if (!_lodash.default.isUndefined(_this5._values[key])) {
         attrs[key] = _this5._values[key];
@@ -423,6 +503,7 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   // definitions for them (necessary for Ampersand State to treat them as values)
   _convertToValues: function _convertToValues() {
     var _this6 = this;
+
     Object.keys(this._children).forEach(function (key) {
       _this6._definition[key] = {
         type: "any"
@@ -442,11 +523,14 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   // The default version always creates an empty model
   _initChildren: function _initChildren() {
     var child;
+
     if (!this._children) {
       return;
     }
+
     for (child in this._children) {
       var val = this._data[child];
+
       if (val) {
         // Assume here that if it's a string, it's a url.
         if (typeof val === "string") {
@@ -454,14 +538,15 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
             url: val
           };
         }
-      }
-
-      // If hydrate is set to false, this will be the name of the child and
+      } // If hydrate is set to false, this will be the name of the child and
       // not the constructor. We want to add the non-hydrated url if so.
+
+
       if (typeof this._children[child] === "function") {
         this._safeSet(child, new this._children[child](val, {
           parent: this
         }));
+
         this.listenTo(this[child], "all", this._getCachedEventBubblingHandler(child));
       } else {
         this._safeSet(child, val);
@@ -471,21 +556,24 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   // Override the initialization of collections to pass in data to the constructor.
   _initCollections: function _initCollections() {
     var coll;
+
     if (!this._collections) {
       return;
     }
+
     for (coll in this._collections) {
       var val = this._data[coll];
+
       if (val) {
         if (typeof val === "string") {
           val = {
             url: val
           };
         }
-      }
-
-      // If hydrate is set to false, this will be the name of the collection and
+      } // If hydrate is set to false, this will be the name of the collection and
       // not the constructor. We want to add the non-hydrated array if so.
+
+
       if (typeof this._collections[coll] === "function") {
         this._safeSet(coll, new this._collections[coll](val, {
           parent: this
@@ -497,11 +585,13 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   },
   _initUnsetValues: function _initUnsetValues() {
     var _this7 = this;
+
     _lodash.default.each(this._unsetChildren, function (child, key) {
       var tmpValue = _this7._values[key];
       replacePropertyDefinition(_this7, key);
       _this7[key] = tmpValue;
     });
+
     _lodash.default.each(this._unsetCollections, function (child, key) {
       var tmpValue = _this7._values[key];
       replacePropertyDefinition(_this7, key);
@@ -520,17 +610,22 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
     if (path === null) {
       return null;
     }
+
     var url = path;
+
     if (url.slice(-1) !== "/" && url.indexOf("?") === -1) {
       url += "/";
     }
+
     if (Object.keys(this.queryData).length) {
       url += "?".concat(_qs.default.stringify(this.queryData, {
         arrayFormat: "repeat"
       }));
     }
+
     return url;
   },
+
   /*
    * Get url
    * @return {String}
@@ -539,6 +634,7 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
     if (this._url && this.isNew()) {
       return this.getFullURLPath(this._url);
     }
+
     return this.getFullURLPath(this.getPlainURL());
   },
   // Returns url without query data
@@ -546,27 +642,34 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
     if (!this.modelName) {
       return null;
     }
+
     var resp = _ampersandModel.default.prototype.url.call(this);
+
     if (resp.slice(-1) !== "/" && resp.indexOf("?") === -1) {
       resp += "/";
     }
+
     if (!resp.includes("{") || !resp.includes("}")) {
       return resp;
-    }
-
-    // Replace any values in a url with one from the model.
+    } // Replace any values in a url with one from the model.
     // So if you have /path/to/{model.id}/
     // It will check the model from "this.model.id" and replace
     // it in the url
+
+
     var re = /(\{(?:\w+\.?)+\})/g;
     var matches = resp.match(re) || [];
+
     var _iterator = _createForOfIteratorHelper(matches),
-      _step;
+        _step;
+
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var match = _step.value;
         var path = match.slice(1, -1);
+
         var replacement = _lodash.default.get(this, path);
+
         if (replacement) {
           resp = resp.replace(match, replacement);
         } else if (!this.isNew()) {
@@ -578,52 +681,105 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
     } finally {
       _iterator.f();
     }
+
     return resp;
   },
   getResourceURL: function getResourceURL() {
     if (this.modelName === null && !Object.keys(_api.Api.resources).length) {
       return null;
     }
+
     if (!Object.keys(_api.Api.resources).length) {
       return "/".concat(this.modelName, "/");
     }
+
     if (this.modelName === null) {
       return _api.Api.getURL();
     }
+
     return _api.Api.getResourceURL(this.modelName);
   },
+  waitForReady: function waitForReady() {
+    var _arguments = arguments,
+        _this8 = this;
+
+    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var opts, attempts;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              opts = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : {};
+              attempts = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : 20;
+
+              if (!(attempts === 0)) {
+                _context.next = 4;
+                break;
+              }
+
+              return _context.abrupt("return", _bluebird.default.reject());
+
+            case 4:
+              return _context.abrupt("return", _this8.fetch(opts).then(function () {
+                if (!_this8.creation_status) {
+                  return _bluebird.default.reject(new Error("No creation_status key found"));
+                }
+
+                if (["ready", "failed"].indexOf(_this8.creation_status) > -1) {
+                  return _bluebird.default.resolve();
+                }
+
+                return _bluebird.default.delay(1000).then(function () {
+                  return _this8.waitForReady(opts, attempts - 1);
+                });
+              }));
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  },
   sync: function sync() {
     return _sync2.sync.apply(this, arguments);
   },
   serialize: function serialize() {
-    var _this8 = this;
+    var _this9 = this;
+
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
       derived: true
     };
+
     // Return nothing if data passed is falsy. More than likely this is
     // a null value
     if (!this._data) {
       return {};
     }
+
     var data = _ampersandModel.default.prototype.serialize.apply(this, arguments);
+
     data.url = this.url();
     var derived = this.getAttributes(opts);
     derived = Object.keys(derived).reduce(function (object, key) {
       var value = derived[key];
+
       if (value instanceof _ampersandRestCollection.default || value instanceof _ampersandModel.default) {
         value = value.toJSON();
       }
+
       object[key] = value;
       return object;
     }, {});
     Object.keys(this._unsetCollections).forEach(function (key) {
-      if (_this8._unsetCollections[key].canBeEmpty && !_this8._values[key]) {
+      if (_this9._unsetCollections[key].canBeEmpty && !_this9._values[key]) {
         derived[key] = [];
       }
     });
     Object.keys(this._unsetChildren).forEach(function (key) {
-      if (_this8._unsetChildren[key].canBeEmpty && !_this8._values[key] && _this8[key]) {
-        derived[key] = _this8[key].url();
+      if (_this9._unsetChildren[key].canBeEmpty && !_this9._values[key] && _this9[key]) {
+        derived[key] = _this9[key].url();
       }
     });
     return _lodash.default.extend(data, derived);
@@ -631,7 +787,8 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
   // Safely retrieve the url from a child or collection that may or may not
   // be hydrated
   _retrieveURL: function _retrieveURL(item) {
-    var _this9 = this;
+    var _this10 = this;
+
     if (_lodash.default.isUndefined(item) || item === null) {
       return item;
     } else if (typeof item === "string") {
@@ -644,14 +801,18 @@ var BaseModel = exports.BaseModel = _ampersandModel.default.extend( /** @lends m
     } else if (_lodash.default.isArray(item)) {
       // It's an array of urls or objects
       return item.map(function (child) {
-        return _this9._retrieveURL(child);
+        return _this10._retrieveURL(child);
       });
     } else if ((0, _typeof2.default)(item) === "object" && item !== null) {
       return typeof item.url === "function" ? item.url() : item.url;
     }
+
     return null;
   }
 });
+
+exports.BaseModel = BaseModel;
+
 function replacePropertyDefinition(object, name) {
   function addCollection(value) {
     var data = typeof value === "string" ? {
@@ -663,6 +824,7 @@ function replacePropertyDefinition(object, name) {
     object._expandedValues[name] = collection;
     return object._expandedValues[name];
   }
+
   function addChild(value) {
     var data = typeof value === "string" ? {
       url: value
@@ -673,16 +835,19 @@ function replacePropertyDefinition(object, name) {
     object._expandedValues[name] = child;
     return object._expandedValues[name];
   }
+
   function expandCollection(value) {
     object._collections[name] = object._unsetCollections[name];
     delete object._unsetCollections[name];
     return addCollection(value);
   }
+
   function expandChild(value) {
     object._children[name] = object._unsetChildren[name];
     delete object._unsetChildren[name];
     return addChild(value);
   }
+
   Object.defineProperty(object, name, {
     set: function set(val) {
       if (_lodash.default.includes(Object.keys(object._children), name)) {
@@ -709,28 +874,34 @@ function replacePropertyDefinition(object, name) {
       if (!this._values) {
         throw new Error("Trying to retrieve value ".concat(name, " of model ").concat(object.modelName, " during constructor"));
       }
+
       if ((_lodash.default.includes(Object.keys(object._collections), name) || _lodash.default.includes(Object.keys(object._children), name)) && _lodash.default.includes(Object.keys(object._expandedValues), name)) {
         return object._expandedValues[name];
       }
+
       var value = object._values[name];
+
       if (this.isFetching) {
         return value;
       }
+
       if ((_lodash.default.isUndefined(value) || value === null) && !(object._unsetChildren[name] && object._unsetChildren[name].canBeEmpty) && !(object._unsetCollections[name] && object._unsetCollections[name].canBeEmpty)) {
         return value;
       }
+
       if (_lodash.default.includes(Object.keys(object._unsetCollections), name)) {
         return expandCollection(value);
       } else if (_lodash.default.includes(Object.keys(object._unsetChildren), name)) {
         return expandChild(value);
       }
+
       return value;
     },
     configurable: true
   });
-}
+} // Make matchesURL available as a static method
+
 
-// Make matchesURL available as a static method
 BaseModel.matchesURL = function (url) {
   return this.prototype.matchesURL(url);
 };