dataflux 1.7.0 → 1.7.4

package/README.md

@@ -20,7 +20,7 @@ npm install dataflux
 
 Using jsDelivr CDN:
 ```html
-<script src="https://cdn.jsdelivr.net/npm/dataflux/dist/index.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dataflux/dist/dataflux.min.js"></script>
 ```
 
 ## Examples
@@ -31,7 +31,7 @@ Consider the following hypothetical store/model declaration common to all the ex
 
 ```js
 // Content of your store.js
-import {Store, Model} from "dataflux";
+const {Store, Model} = require("dataflux");
 
 // We create a new Store
 const store = new Store();
@@ -182,7 +182,7 @@ const callback = ({book, author}) => {
   // Objects are ready
 };
 
-const subKey = store.multipleSubscribe(requests, callback); // Subscribe
+const subKey = store.multipleSubscribe(subscriptions, callback); // Subscribe
 
 store.unsubscribe(subKey); // Unsubscribe
 ```
@@ -205,8 +205,8 @@ class MyComponent extends React.Component {
     // Get all books with a price < 20
     store.findAll("book", "books", this, ({price}) => price < 20);
     // An attribute "books" will be added/updated in the 
-    // state (the rest of the state remains unchanged) every time
-    // a book in our selection is inserted/deleted/edited.
+    // state every time a book in our selection is inserted/deleted/edited,
+    // the rest of the state remains unchanged.
 
     // findAll is a syntactic sugar for:
     // const callback = (books) => {this.setState({...this.state, books})};
@@ -392,10 +392,14 @@ To create a factory, you must declare a model as follows:
 ```js
 const author = new Model("author", {
   lazyLoad: true, // It MUST be lazyLoaded
-  retrieve: ({params}) => { // The retrieve function now takes some parameters
-
-    // You can return a URL or directly one or more JSON objects
-    return `https://api.example.net/authors/${params.id}`;
+  retrieve: (params) => { // The retrieve function now takes some parameters
+
+    if (params) {
+      // You can return a URL or directly one or more JSON objects
+      return `https://api.example.net/authors/${params.id}`
+    } else {
+      return Promise.resolve([]); // It's important to handle the base case where params is null
+    }
   }
 });
 

package/dist/BasicObj.js

@@ -48,7 +48,9 @@ function setValues(values, model, SubObj, parent, context) {
       context[key] = mmnt.isValid() ? mmnt : value;
     } else if (model.options.deep && value != null && _typeof(value) === "object" && !Array.isArray(value)) {
       context[key] = new SubObj(parent, key, value, model);
-    } else if (model.options.deep && value != null && Array.isArray(value)) {
+    } else if (model.options.deep && value != null && Array.isArray(value) && !value.some(function (str) {
+      return ["string", "number"].includes(_typeof(str));
+    })) {
       context[key] = value.map(function (i) {
         return new SubObj(parent, key, i, model);
       });

package/dist/Model.js

@@ -17,8 +17,6 @@ var _SubObj = _interopRequireDefault(require("./SubObj"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -31,6 +29,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, 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); }
@@ -99,6 +99,8 @@ var _bulkOperation = /*#__PURE__*/new WeakMap();
 
 var _toArray = /*#__PURE__*/new WeakMap();
 
+var _unWrap = /*#__PURE__*/new WeakMap();
+
 var _insertObjects = /*#__PURE__*/new WeakMap();
 
 var _updateObjects = /*#__PURE__*/new WeakMap();
@@ -193,7 +195,8 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
       return _this.getStore().whenSaved(_this.getType())["catch"](function (e) {
         throw new Error("You cannot perform load() on an unsaved object.");
       }).then(function () {
-        var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJSON());
+        var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJSON()); // toJSON to avoid side effects;
+
 
         if (typeof res === "string") {
           return _classPrivateFieldGet(_this, _axios).call(_this, {
@@ -260,13 +263,11 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
   _defineProperty(this, "retrieveAll", function () {
     return (0, _modelHooksUtils.executeHook)("retrieve", _classPrivateFieldGet(_this, _retrieveHook), null, _classPrivateFieldGet(_this, _axios)).then(function (data) {
-      if (Array.isArray(data)) {
-        return data;
-      } else {
+      if (!Array.isArray(data)) {
         _classPrivateFieldSet(_this, _singleItemQuery, true);
-
-        return [data];
       }
+
+      return _classPrivateFieldGet(_this, _toArray).call(_this, data);
     });
   });
 
@@ -286,7 +287,13 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     if (!_this.options.lazyLoad) {
       return Promise.reject("Factory can be used only on a model declared with lazyLoad: true");
     } else {
-      return (0, _modelHooksUtils.executeHook)("retrieve", _classPrivateFieldGet(_this, _retrieveHook), params, _classPrivateFieldGet(_this, _axios));
+      return (0, _modelHooksUtils.executeHook)("retrieve", _classPrivateFieldGet(_this, _retrieveHook), params, _classPrivateFieldGet(_this, _axios)).then(function (data) {
+        if (!Array.isArray(data)) {
+          _classPrivateFieldSet(_this, _singleItemQuery, true);
+        }
+
+        return _classPrivateFieldGet(_this, _toArray).call(_this, data);
+      });
     }
   });
 
@@ -351,9 +358,36 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     writable: true,
     value: function value(data) {
       if (Array.isArray(data)) {
-        return data;
+        if (data.every(function (str) {
+          return ["string", "number"].includes(_typeof(str));
+        })) {
+          return [{
+            value: data
+          }];
+        } else {
+          return data;
+        }
       } else {
-        return [data];
+        if (["string", "number"].includes(_typeof(data))) {
+          return [{
+            value: data
+          }];
+        } else {
+          return [data];
+        }
+      }
+    }
+  });
+
+  _classPrivateFieldInitSpec(this, _unWrap, {
+    writable: true,
+    value: function value(data) {
+      if (data.value != null && Object.keys(data).length === 1) {
+        return data.value;
+      } else if (Array.isArray(data) && data.length === 1 && data[0].value != null && Object.keys(data[0]).length === 1) {
+        return data[0].value;
+      } else {
+        return data;
       }
     }
   });
@@ -361,21 +395,21 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   _classPrivateFieldInitSpec(this, _insertObjects, {
     writable: true,
     value: function value(data) {
-      return (0, _modelHooksUtils.executeHook)("insert", _classPrivateFieldGet(_this, _insertHook), data, _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+      return (0, _modelHooksUtils.executeHook)("insert", _classPrivateFieldGet(_this, _insertHook), _classPrivateFieldGet(_this, _unWrap).call(_this, data), _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
     }
   });
 
   _classPrivateFieldInitSpec(this, _updateObjects, {
     writable: true,
     value: function value(data) {
-      return (0, _modelHooksUtils.executeHook)("update", _classPrivateFieldGet(_this, _updateHook), data, _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+      return (0, _modelHooksUtils.executeHook)("update", _classPrivateFieldGet(_this, _updateHook), _classPrivateFieldGet(_this, _unWrap).call(_this, data), _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
     }
   });
 
   _classPrivateFieldInitSpec(this, _deleteObjects, {
     writable: true,
     value: function value(data) {
-      return (0, _modelHooksUtils.executeHook)("delete", _classPrivateFieldGet(_this, _deleteHook), data, _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+      return (0, _modelHooksUtils.executeHook)("delete", _classPrivateFieldGet(_this, _deleteHook), _classPrivateFieldGet(_this, _unWrap).call(_this, data), _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
     }
   });