intelicoreact 1.3.21 → 1.3.22

package/dist/Functions/useFormTools/form-drivers/ObjectWithIterableObjects.js

@@ -1,79 +1,59 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ObjectWithIterableObjects;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-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) { (0, _defineProperty2.default)(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 ObjectWithIterableObjects(_ref) {
-  var form = _ref.form,
-      setForm = _ref.setForm,
-      FormFields = _ref.FormFields;
-
-  var joinData = function joinData() {
+  let {
+    form,
+    setForm,
+    FormFields
+  } = _ref;
+  const joinData = function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
-    var mainArg = args[0];
-    var MainArgProto = Array.isArray(mainArg) ? 'Array' : (0, _typeof2.default)(mainArg) === 'object' ? 'Object' : undefined;
-    var template = Array.isArray(mainArg) ? [] : (0, _typeof2.default)(mainArg) === 'object' ? {} : null;
+    const [mainArg] = args;
+    const MainArgProto = Array.isArray(mainArg) ? 'Array' : typeof mainArg === 'object' ? 'Object' : undefined;
+    const template = Array.isArray(mainArg) ? [] : typeof mainArg === 'object' ? {} : null;
     if (!template) return undefined;
-    return args.reduce(function (result, item) {
+    return args.reduce((result, item) => {
       if (MainArgProto === 'Array') {
         if (Array.isArray(item)) {
-          return [].concat((0, _toConsumableArray2.default)(result), (0, _toConsumableArray2.default)(item));
+          return [...result, ...item];
         } else {
-          return [].concat((0, _toConsumableArray2.default)(result), [item]);
+          return [...result, item];
         }
       } else if (MainArgProto === 'Object') {
-        return _objectSpread(_objectSpread({}, result), item);
+        return {
+          ...result,
+          ...item
+        };
       } else {
         return template;
       }
     }, template);
   };
-
-  var getFieldData = function getFieldData(key) {
+  const getFieldData = key => {
     if (Array.isArray(FormFields)) {
-      return FormFields[key] || FormFields.find(function (f) {
-        return f.key === key;
-      });
-    } else if ((0, _typeof2.default)(FormFields) === 'object') {
-      return FormFields[key] || Object.values(FormFields).find(function (f) {
-        return f.key === key;
-      });
+      return FormFields[key] || FormFields.find(f => f.key === key);
+    } else if (typeof FormFields === 'object') {
+      return FormFields[key] || Object.values(FormFields).find(f => f.key === key);
     } else {
       return undefined;
     }
   };
-
-  var getFormFields = function getFormFields() {
+  const getFormFields = () => {
     return form.fields || form;
   };
-
-  var getFormField = function getFormField(key) {
+  const getFormField = key => {
     // eslint-disable-next-line no-undef
     if (FormProto === 'Array') {
-      return getFormFields().find(function (field) {
-        return field.key === key;
-      }); // eslint-disable-next-line no-undef
+      return getFormFields().find(field => field.key === key);
+      // eslint-disable-next-line no-undef
     } else if (FormProto === 'Object') {
-      return Object.values(getFormFields()).find(function (field) {
-        return field.key === key;
-      }) || Object.keys(getFormFields()).reduce(function (result, field) {
+      return Object.values(getFormFields()).find(field => field.key === key) || Object.keys(getFormFields()).reduce((result, field) => {
         if (field === key) result = getFormFields()[field];
         return result;
       }, {});
@@ -81,86 +61,85 @@ function ObjectWithIterableObjects(_ref) {
       return undefined;
     }
   };
-
-  var setFormFields = function setFormFields(data) {
-    var isFunction = typeof data === 'function';
-    setForm(function (state) {
+  const setFormFields = data => {
+    const isFunction = typeof data === 'function';
+    setForm(state => {
       if (state.fields) {
-        return _objectSpread(_objectSpread({}, state), {}, {
+        return {
+          ...state,
           fields: isFunction ? data(state.fields) : data
-        });
+        };
       } else {
         return isFunction ? data(state) : data;
       }
     });
   };
-
-  var setFormField = function setFormField(data) {
-    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    var isFunction = typeof data === 'function';
-    setFormFields(function (fields) {
-      var pop = function pop(fields, key) {
-        var result = {
-          fields: fields,
+  const setFormField = function (data) {
+    let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    const isFunction = typeof data === 'function';
+    setFormFields(fields => {
+      const pop = (fields, key) => {
+        const result = {
+          fields,
           item: undefined
         };
-        result.item = fields[key] || fields.find(function (f) {
-          return f.key === key;
-        });
+        result.item = fields[key] || fields.find(f => f.key === key);
         if (!result.item) return result;
-
         if (Array.isArray(fields)) {
-          var index = parseInt(key);
-
+          const index = parseInt(key);
           if (!isNaN(index)) {
             result.fields.splice(key, 1);
           } else {
-            result.fields = result.fields.filter(function (f) {
-              return f.key !== key;
-            });
+            result.fields = result.fields.filter(f => f.key !== key);
           }
-        } else if ((0, _typeof2.default)(fields) === 'object') {
-          result.fields = Object.values(fields).reduce(function (object, _ref2) {
-            var fKey = _ref2.key;
-
+        } else if (typeof fields === 'object') {
+          result.fields = Object.values(fields).reduce((object, _ref2) => {
+            let {
+              key: fKey
+            } = _ref2;
             if (key !== fKey) {
               object[key] = fields[key];
             }
-
             return object;
           }, {});
         }
-
         return result;
       };
-
-      var update = function update(fields) {
+      const update = fields => {
         //KEY is NULLable
         if (!key) {
-          return data.key ? Object.values(fields).reduce(function (result, field, i) {
-            var index = fields[field.key] ? field.key : i;
-            return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, index, data.key === field.key ? isFunction ? data(field) : data : field));
-          }, {}) : _objectSpread(_objectSpread({}, fields), {}, (0, _defineProperty2.default)({}, fields.length || 0, isFunction ? data({}) : data));
+          return data.key ? Object.values(fields).reduce((result, field, i) => {
+            const index = fields[field.key] ? field.key : i;
+            return {
+              ...result,
+              [index]: data.key === field.key ? isFunction ? data(field) : data : field
+            };
+          }, {}) : {
+            ...fields,
+            [fields.length || 0]: isFunction ? data({}) : data
+          };
         }
-
-        var _pop = pop(fields, key),
-            filtered = _pop.fields,
-            field = _pop.item;
-
-        var updatedField = isFunction ? data(field || {}) : _objectSpread(_objectSpread({}, field), data);
-        return joinData(filtered, fields[key] ? (0, _defineProperty2.default)({}, key, updatedField) : updatedField);
+        const {
+          fields: filtered,
+          item: field
+        } = pop(fields, key);
+        const updatedField = isFunction ? data(field || {}) : {
+          ...field,
+          ...data
+        };
+        return joinData(filtered, fields[key] ? {
+          [key]: updatedField
+        } : updatedField);
       };
-
       return update(fields);
     });
   };
-
   return {
-    joinData: joinData,
-    getFieldData: getFieldData,
-    getFormFields: getFormFields,
-    getFormField: getFormField,
-    setFormFields: setFormFields,
-    setFormField: setFormField
+    joinData,
+    getFieldData,
+    getFormFields,
+    getFormField,
+    setFormFields,
+    setFormField
   };
 }

package/dist/Functions/useFormTools/form-drivers/ObjectWithNamedKeyObjects.js

@@ -1,114 +1,78 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ObjectWithNamedKeyObjects;
-
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _General2 = _interopRequireDefault(require("../functions/General"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-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) { (0, _defineProperty2.default)(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; }
-
-var noop = function noop() {};
-
+var _General = _interopRequireDefault(require("../functions/General"));
+const noop = () => {};
 function ObjectWithNamedKeyObjects() {
-  var _ref4;
-
-  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      form = _ref.form,
-      _ref$setForm = _ref.setForm,
-      setForm = _ref$setForm === void 0 ? noop : _ref$setForm,
-      FormFields = _ref.FormFields;
-
-  var _General = (0, _General2.default)({
-    FormFields: FormFields
-  }),
-      joinData = _General.joinData,
-      getFieldData = _General.getFieldData,
-      updateFormField = _General.updateFormField,
-      _getFormFields = _General.getFormFields,
-      _getFormFieldsAsArray = _General.getFormFieldsAsArray,
-      _getFormFieldsKeys = _General.getFormFieldsKeys;
-
-  var getFormField = function getFormField(key) {
+  let {
+    form,
+    setForm = noop,
+    FormFields
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const {
+    joinData,
+    getFieldData,
+    updateFormField,
+    getFormFields,
+    getFormFieldsAsArray,
+    getFormFieldsKeys
+  } = (0, _General.default)({
+    FormFields
+  });
+  const getFormField = function (key) {
     var _Object$values, _Object$keys;
-
-    var argForm = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : form;
-    return ((_Object$values = Object.values(_getFormFields(argForm))) === null || _Object$values === void 0 ? void 0 : _Object$values.find(function (field) {
-      return (field === null || field === void 0 ? void 0 : field.key) === key;
-    })) || ((_Object$keys = Object.keys(_getFormFields(argForm))) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (result, field) {
-      if (field === key) result = _getFormFields(argForm)[field];
+    let argForm = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : form;
+    return ((_Object$values = Object.values(getFormFields(argForm))) === null || _Object$values === void 0 ? void 0 : _Object$values.find(field => (field === null || field === void 0 ? void 0 : field.key) === key)) || ((_Object$keys = Object.keys(getFormFields(argForm))) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce((result, field) => {
+      if (field === key) result = getFormFields(argForm)[field];
       return result;
     }, null));
   };
-
-  var setFormFields = function setFormFields(data) {
-    var isFunction = typeof data === 'function';
-    setForm(function (state) {
+  const setFormFields = data => {
+    const isFunction = typeof data === 'function';
+    setForm(state => {
       if (state.fields) {
-        return _objectSpread(_objectSpread({}, state), {}, {
+        return {
+          ...state,
           fields: isFunction ? data(state.fields) : data
-        });
+        };
       } else {
         return isFunction ? data(state) : data;
       }
     });
   };
-
-  var setFormField = function setFormField(data) {
-    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    return setFormFields(function (fields) {
-      return updateFormField(fields, data, key);
-    });
+  const setFormField = function (data) {
+    let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    return setFormFields(fields => updateFormField(fields, data, key));
   };
-
-  var removeAllFormFields = function removeAllFormFields() {
-    return setFormFields({});
+  const removeAllFormFields = () => setFormFields({});
+  const removeFormField = key => setFormFields(state => Object.keys(state).filter(fKey => fKey !== key).reduce((obj, key) => ({
+    ...obj,
+    [key]: state[key]
+  }), {}));
+  const removeFormFields = _ref => {
+    let [...keys] = _ref;
+    return setFormFields(state => Object.keys(state).filter(fKey => !keys.includes(fKey)).reduce((obj, key) => ({
+      ...obj,
+      [key]: state[key]
+    }), {}));
   };
-
-  var removeFormField = function removeFormField(key) {
-    return setFormFields(function (state) {
-      return Object.keys(state).filter(function (fKey) {
-        return fKey !== key;
-      }).reduce(function (obj, key) {
-        return _objectSpread(_objectSpread({}, obj), {}, (0, _defineProperty2.default)({}, key, state[key]));
-      }, {});
-    });
+  return {
+    joinData,
+    getFieldData,
+    getFormFields,
+    getFormField,
+    setFormFields,
+    setFormField,
+    // eslint-disable-next-line no-dupe-keys
+    getFormFields: () => getFormFields(form),
+    getFormFieldsAsArray: () => getFormFieldsAsArray(getFormFields(form)),
+    getFormFieldsKeys: () => getFormFieldsKeys(getFormFields(form)),
+    removeAllFormFields,
+    removeFormField,
+    removeFormFields
   };
-
-  var removeFormFields = function removeFormFields(_ref2) {
-    var _ref3 = (0, _toArray2.default)(_ref2),
-        keys = _ref3.slice(0);
-
-    return setFormFields(function (state) {
-      return Object.keys(state).filter(function (fKey) {
-        return !keys.includes(fKey);
-      }).reduce(function (obj, key) {
-        return _objectSpread(_objectSpread({}, obj), {}, (0, _defineProperty2.default)({}, key, state[key]));
-      }, {});
-    });
-  };
-
-  return _ref4 = {
-    joinData: joinData,
-    getFieldData: getFieldData,
-    getFormFields: _getFormFields,
-    getFormField: getFormField,
-    setFormFields: setFormFields,
-    setFormField: setFormField
-  }, (0, _defineProperty2.default)(_ref4, "getFormFields", function getFormFields() {
-    return _getFormFields(form);
-  }), (0, _defineProperty2.default)(_ref4, "getFormFieldsAsArray", function getFormFieldsAsArray() {
-    return _getFormFieldsAsArray(_getFormFields(form));
-  }), (0, _defineProperty2.default)(_ref4, "getFormFieldsKeys", function getFormFieldsKeys() {
-    return _getFormFieldsKeys(_getFormFields(form));
-  }), (0, _defineProperty2.default)(_ref4, "removeAllFormFields", removeAllFormFields), (0, _defineProperty2.default)(_ref4, "removeFormField", removeFormField), (0, _defineProperty2.default)(_ref4, "removeFormFields", removeFormFields), _ref4;
 }

package/dist/Functions/useFormTools/functions/General.js

@@ -1,158 +1,139 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = General;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-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) { (0, _defineProperty2.default)(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 General() {
-  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      form = _ref.form,
-      _ref$FormFields = _ref.FormFields,
-      FormFields = _ref$FormFields === void 0 ? [] : _ref$FormFields;
-
-  var joinData = function joinData() {
+  let {
+    form,
+    FormFields = []
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const joinData = function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
-    var mainArg = args[0];
-    var MainArgProto = Array.isArray(mainArg) ? 'Array' : (0, _typeof2.default)(mainArg) === 'object' ? 'Object' : undefined;
-    var template = Array.isArray(mainArg) ? [] : (0, _typeof2.default)(mainArg) === 'object' ? {} : null;
+    const [mainArg] = args;
+    const MainArgProto = Array.isArray(mainArg) ? 'Array' : typeof mainArg === 'object' ? 'Object' : undefined;
+    const template = Array.isArray(mainArg) ? [] : typeof mainArg === 'object' ? {} : null;
     if (!template) return undefined;
-    return args.reduce(function (result, item) {
+    return args.reduce((result, item) => {
       if (MainArgProto === 'Array') {
         if (Array.isArray(item)) {
-          return [].concat((0, _toConsumableArray2.default)(result), (0, _toConsumableArray2.default)(item));
+          return [...result, ...item];
         } else {
-          return [].concat((0, _toConsumableArray2.default)(result), [item]);
+          return [...result, item];
         }
       } else if (MainArgProto === 'Object') {
-        return _objectSpread(_objectSpread({}, result), item);
+        return {
+          ...result,
+          ...item
+        };
       } else {
         return template;
       }
     }, template);
   };
-
-  var getFieldData = function getFieldData(key) {
+  const getFieldData = key => {
     if (Array.isArray(FormFields)) {
       if (FormFields[key]) {
-        return _objectSpread({}, FormFields[key]);
+        return {
+          ...FormFields[key]
+        };
       } else {
-        return _objectSpread({}, FormFields.find(function (f) {
-          return f.key === key;
-        }));
+        return {
+          ...FormFields.find(f => f.key === key)
+        };
       }
-    } else if ((0, _typeof2.default)(FormFields) === 'object') {
-      return _objectSpread({}, FormFields[key]) || _objectSpread({}, Object.values(FormFields).find(function (f) {
-        return f.key === key;
-      }));
+    } else if (typeof FormFields === 'object') {
+      return {
+        ...FormFields[key]
+      } || {
+        ...Object.values(FormFields).find(f => f.key === key)
+      };
     } else {
       return undefined;
     }
   };
-
-  var getFormFields = function getFormFields() {
-    var argForm = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : form;
+  const getFormFields = function () {
+    let argForm = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : form;
     return (argForm === null || argForm === void 0 ? void 0 : argForm.fields) || argForm;
   };
-
-  var getFormFieldsAsArray = function getFormFieldsAsArray(fields) {
+  const getFormFieldsAsArray = fields => {
     if (Array.isArray(fields)) return fields;
-
-    if ((0, _typeof2.default)(fields) === 'object') {
+    if (typeof fields === 'object') {
       return Object.values(fields);
     }
-
     return fields;
   };
-
-  var getFormFieldsKeys = function getFormFieldsKeys() {
-    var fields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getFormFields();
-    if (Array.isArray(fields)) return fields.map(function (_ref2) {
-      var key = _ref2.key;
+  const getFormFieldsKeys = function () {
+    let fields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getFormFields();
+    if (Array.isArray(fields)) return fields.map(_ref => {
+      let {
+        key
+      } = _ref;
       return key;
     });
-
-    if ((0, _typeof2.default)(fields) === 'object') {
-      return Object.values(fields).map(function (_ref3) {
-        var key = _ref3.key;
+    if (typeof fields === 'object') {
+      return Object.values(fields).map(_ref2 => {
+        let {
+          key
+        } = _ref2;
         return key;
       });
     }
-
     return fields;
   };
-
-  var popFormField = function popFormField(fields, key) {
-    var result = {
+  const popFormField = (fields, key) => {
+    const result = {
       item: undefined,
       itemIndex: undefined
     };
-
     if (Array.isArray(fields)) {
-      result.item = fields === null || fields === void 0 ? void 0 : fields.find(function (f) {
-        return f.key === key;
-      });
-      result.itemIndex = result.item ? fields.findIndex(function (f) {
-        return f.key === key;
-      }) : fields.length;
-    } else if ((0, _typeof2.default)(fields) === 'object') {
-      result.item = fields[key] || Object.values(fields).find(function (f) {
-        return f.key === key;
-      });
-      result.itemIndex = result.item ? fields[key] ? key : Object.values(fields).findIndex(function (f) {
-        return f.key === key;
-      }) : key;
+      result.item = fields === null || fields === void 0 ? void 0 : fields.find(f => f.key === key);
+      result.itemIndex = result.item ? fields.findIndex(f => f.key === key) : fields.length;
+    } else if (typeof fields === 'object') {
+      result.item = fields[key] || Object.values(fields).find(f => f.key === key);
+      result.itemIndex = result.item ? fields[key] ? key : Object.values(fields).findIndex(f => f.key === key) : key;
     }
-
     return result;
   };
-
-  var updateFormField = function updateFormField(fields, data, key) {
-    var isFunction = typeof data === 'function'; //KEY is NULLable
-
+  const updateFormField = (fields, data, key) => {
+    const isFunction = typeof data === 'function';
+    //KEY is NULLable
     if (!key) {
-      return data.key ? Object.values(fields).reduce(function (result, field, i) {
-        var index = fields[field.key] ? field.key : i;
-        return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, index, data.key === field.key ? isFunction ? data(field) : data : field));
-      }, {}) : _objectSpread(_objectSpread({}, fields), {}, (0, _defineProperty2.default)({}, fields.length || 0, isFunction ? data({}) : data));
+      return data.key ? Object.values(fields).reduce((result, field, i) => {
+        const index = fields[field.key] ? field.key : i;
+        return {
+          ...result,
+          [index]: data.key === field.key ? isFunction ? data(field) : data : field
+        };
+      }, {}) : {
+        ...fields,
+        [fields.length || 0]: isFunction ? data({}) : data
+      };
     }
-
-    var _popFormField = popFormField(fields, key),
-        _popFormField$item = _popFormField.item,
-        field = _popFormField$item === void 0 ? data : _popFormField$item,
-        itemIndex = _popFormField.itemIndex;
-
-    fields[itemIndex] = isFunction ? data(field || {}) : _objectSpread(_objectSpread({}, field), data);
+    const {
+      item: field = data,
+      itemIndex
+    } = popFormField(fields, key);
+    fields[itemIndex] = isFunction ? data(field || {}) : {
+      ...field,
+      ...data
+    };
     return fields;
   };
-
-  var getFieldClassName = function getFieldClassName(key, type) {
+  const getFieldClassName = (key, type) => {
     return "form-".concat(type, "_field-").concat(key);
   };
-
   return {
-    joinData: joinData,
-    getFieldData: getFieldData,
-    popFormField: popFormField,
-    updateFormField: updateFormField,
-    getFormFields: getFormFields,
-    getFormFieldsAsArray: getFormFieldsAsArray,
-    getFieldClassName: getFieldClassName,
-    getFormFieldsKeys: getFormFieldsKeys
+    joinData,
+    getFieldData,
+    popFormField,
+    updateFormField,
+    getFormFields,
+    getFormFieldsAsArray,
+    getFieldClassName,
+    getFormFieldsKeys
   };
 }