dataflux 1.7.1 → 1.7.2

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); }
@@ -260,13 +260,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);
     });
   });
 
@@ -351,9 +349,23 @@ 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];
+        }
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataflux",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "DataFlux, automatically interfaces with your REST APIs to create a 2-way-synced local data store. Transparently manages data propagation in the React state.",
   "main": "dist/index.js",
   "bin": "dist/index.js",