dataflux 1.17.3 → 1.17.5

package/dist/Model.js

@@ -80,20 +80,22 @@ var _cleanApiError = /*#__PURE__*/new WeakMap();
 var _removeFromStoreSilentlyAfterFailure = /*#__PURE__*/new WeakMap();
 var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name) {
   var _this = this,
-    _ref2,
-    _options$deep,
     _ref3,
+    _options$deep,
+    _ref4,
     _options$parseMoment,
     _options$lazyLoad,
-    _ref4,
-    _options$validate,
     _ref5,
-    _options$autoSave,
+    _options$validate,
     _ref6,
-    _options$autoRefresh,
+    _options$autoSave,
     _ref7,
-    _options$pre,
+    _options$autoRefresh,
     _ref8,
+    _options$pre,
+    _ref9,
+    _options$hiddenFields,
+    _ref10,
     _options$post;
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var defaults = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -263,8 +265,8 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
     _classPrivateFieldGet(_includes, _this)[includedType] = filterFunction;
   });
   _classPrivateFieldInitSpec(this, _removeHiddenFields, function (json) {
-    var _classPrivateFieldGet3;
-    var _iterator = _createForOfIteratorHelper((_classPrivateFieldGet3 = _classPrivateFieldGet(_hiddenFields, _this)) !== null && _classPrivateFieldGet3 !== void 0 ? _classPrivateFieldGet3 : []),
+    var _ref;
+    var _iterator = _createForOfIteratorHelper((_ref = _this === null || _this === void 0 ? void 0 : _classPrivateFieldGet(_hiddenFields, _this)) !== null && _ref !== void 0 ? _ref : []),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -279,7 +281,7 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
     if (json && _typeof(json) === "object") {
       for (var _i = 0, _Object$values = Object.values(json); _i < _Object$values.length; _i++) {
         var obj = _Object$values[_i];
-        if (_typeof(obj) === "object") {
+        if (obj && _typeof(obj) === "object") {
           _classPrivateFieldGet(_removeHiddenFields, _this).call(_this, obj);
         }
       }
@@ -364,14 +366,14 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
     });
   });
   _classPrivateFieldInitSpec(this, _hanldeApiError, function (error, objects, operation) {
-    var _error$response$data, _error2, _ref, _error$message, _error3, _error4;
+    var _error$response$data, _error2, _ref2, _error$message, _error3, _error4;
     error = (_error$response$data = (_error2 = error) === null || _error2 === void 0 || (_error2 = _error2.response) === null || _error2 === void 0 ? void 0 : _error2.data) !== null && _error$response$data !== void 0 ? _error$response$data : error;
     var targets = objects.map(function (object) {
       return object.getId();
     });
 
     // Set errors
-    var strError = (_ref = (_error$message = (_error3 = error) === null || _error3 === void 0 ? void 0 : _error3.message) !== null && _error$message !== void 0 ? _error$message : (_error4 = error) === null || _error4 === void 0 ? void 0 : _error4.error) !== null && _ref !== void 0 ? _ref : error;
+    var strError = (_ref2 = (_error$message = (_error3 = error) === null || _error3 === void 0 ? void 0 : _error3.message) !== null && _error$message !== void 0 ? _error$message : (_error4 = error) === null || _error4 === void 0 ? void 0 : _error4.error) !== null && _ref2 !== void 0 ? _ref2 : error;
     Object.values(objects).map(function (object) {
       return object.setError(strError);
     });
@@ -403,19 +405,20 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
   });
   _classPrivateFieldSet(_type, this, name);
   this.options = _objectSpread(_objectSpread({}, _typeof(options) === "object" ? options : {}), {}, {
-    deep: (_ref2 = (_options$deep = options.deep) !== null && _options$deep !== void 0 ? _options$deep : defaults.deep) !== null && _ref2 !== void 0 ? _ref2 : true,
-    parseMoment: (_ref3 = (_options$parseMoment = options.parseMoment) !== null && _options$parseMoment !== void 0 ? _options$parseMoment : defaults.parseMoment) !== null && _ref3 !== void 0 ? _ref3 : false,
+    deep: (_ref3 = (_options$deep = options.deep) !== null && _options$deep !== void 0 ? _options$deep : defaults.deep) !== null && _ref3 !== void 0 ? _ref3 : true,
+    parseMoment: (_ref4 = (_options$parseMoment = options.parseMoment) !== null && _options$parseMoment !== void 0 ? _options$parseMoment : defaults.parseMoment) !== null && _ref4 !== void 0 ? _ref4 : false,
     lazyLoad: (_options$lazyLoad = options.lazyLoad) !== null && _options$lazyLoad !== void 0 ? _options$lazyLoad : defaults.lazyLoad,
-    validate: (_ref4 = (_options$validate = options.validate) !== null && _options$validate !== void 0 ? _options$validate : defaults.validate) !== null && _ref4 !== void 0 ? _ref4 : {},
-    autoSave: (_ref5 = (_options$autoSave = options.autoSave) !== null && _options$autoSave !== void 0 ? _options$autoSave : defaults.autoSave) !== null && _ref5 !== void 0 ? _ref5 : null,
-    autoRefresh: (_ref6 = (_options$autoRefresh = options.autoRefresh) !== null && _options$autoRefresh !== void 0 ? _options$autoRefresh : defaults.autoRefresh) !== null && _ref6 !== void 0 ? _ref6 : false,
-    pre: (_ref7 = (_options$pre = options.pre) !== null && _options$pre !== void 0 ? _options$pre : defaults.pre) !== null && _ref7 !== void 0 ? _ref7 : null,
-    post: (_ref8 = (_options$post = options.post) !== null && _options$post !== void 0 ? _options$post : defaults.post) !== null && _ref8 !== void 0 ? _ref8 : null
+    validate: (_ref5 = (_options$validate = options.validate) !== null && _options$validate !== void 0 ? _options$validate : defaults.validate) !== null && _ref5 !== void 0 ? _ref5 : {},
+    autoSave: (_ref6 = (_options$autoSave = options.autoSave) !== null && _options$autoSave !== void 0 ? _options$autoSave : defaults.autoSave) !== null && _ref6 !== void 0 ? _ref6 : null,
+    autoRefresh: (_ref7 = (_options$autoRefresh = options.autoRefresh) !== null && _options$autoRefresh !== void 0 ? _options$autoRefresh : defaults.autoRefresh) !== null && _ref7 !== void 0 ? _ref7 : false,
+    pre: (_ref8 = (_options$pre = options.pre) !== null && _options$pre !== void 0 ? _options$pre : defaults.pre) !== null && _ref8 !== void 0 ? _ref8 : null,
+    hiddenFields: (_ref9 = (_options$hiddenFields = options.hiddenFields) !== null && _options$hiddenFields !== void 0 ? _options$hiddenFields : defaults.hiddenFields) !== null && _ref9 !== void 0 ? _ref9 : [],
+    post: (_ref10 = (_options$post = options.post) !== null && _options$post !== void 0 ? _options$post : defaults.post) !== null && _ref10 !== void 0 ? _ref10 : null
   });
   _classPrivateFieldSet(_store, this, null);
   _classPrivateFieldSet(_includes, this, {});
   _classPrivateFieldSet(_axios, this, this.options.axios || _redaxios["default"]);
-  _classPrivateFieldSet(_hiddenFields, this, this.options.hiddenFields || []);
+  _classPrivateFieldSet(_hiddenFields, this, this.options.hiddenFields);
   _classPrivateFieldSet(_loadFunction, this, this.options.load || null);
   if (!name || !options) {
     throw new Error("A Model requires at least a name and a hook");
@@ -423,12 +426,12 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
   if (_classPrivateFieldGet(_loadFunction, this) && typeof _classPrivateFieldGet(_loadFunction, this) !== "function") {
     throw new Error("The load option must be a function");
   }
-  var _ref9 = _typeof(options) === "object" ? (0, _modelHooksUtils.getHooksFromOptions)(options) : (0, _modelHooksUtils.getHooksFromUrl)(options),
-    _ref10 = _slicedToArray(_ref9, 4),
-    retrieveHook = _ref10[0],
-    insertHook = _ref10[1],
-    updateHook = _ref10[2],
-    deleteHook = _ref10[3];
+  var _ref11 = _typeof(options) === "object" ? (0, _modelHooksUtils.getHooksFromOptions)(options) : (0, _modelHooksUtils.getHooksFromUrl)(options),
+    _ref12 = _slicedToArray(_ref11, 4),
+    retrieveHook = _ref12[0],
+    insertHook = _ref12[1],
+    updateHook = _ref12[2],
+    deleteHook = _ref12[3];
   _classPrivateFieldSet(_retrieveHook, this, retrieveHook);
   _classPrivateFieldSet(_updateHook, this, updateHook);
   _classPrivateFieldSet(_insertHook, this, insertHook);