@atlaskit/editor-core 151.3.0 → 151.3.1

package/dist/cjs/ui/ConfigPanel/transformers.js

@@ -5,15 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.deserialize = exports.serialize = void 0;
+exports.deserialize = exports.serialize = exports.findDuplicateFields = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
@@ -36,10 +36,9 @@ var isOption = function isOption(option) {
 var isOptions = function isOptions(options) {
   return Array.isArray(options) && options.every(isOption);
 };
-/** maps the typed-values from the Form values object */
-
 
-function extract(value, field) {
+/** maps the typed-values from the Form values object */
+function extract(value, field, options) {
   if (isOptions(value)) {
     return value.map(function (item) {
       return item.value;
@@ -54,230 +53,466 @@ function extract(value, field) {
     }
 
     return Number(value);
+  } // Workaround for https://product-fabric.atlassian.net/browse/DST-2701
+  else if (options !== null && options !== void 0 && options.useDefaultValue && value === undefined && 'defaultValue' in field) {
+    return field.defaultValue;
   }
 
   return value;
 }
 
+var findDuplicateFields = function findDuplicateFields(fields) {
+  return findDuplicateFieldsInternal(flattenFields(fields));
+};
+
+exports.findDuplicateFields = findDuplicateFields;
+
+var findDuplicateFieldsInternal = function findDuplicateFieldsInternal(fields) {
+  var allowDuplicatesMap = {};
+  return fields.find(function (field) {
+    if ((0, _extensions.isExpand)(field)) {
+      return findDuplicateFieldsInternal(field.fields);
+    } else if ((0, _extensions.isTabGroup)(field)) {
+      return field.fields.find(function (tabField) {
+        return findDuplicateFieldsInternal(tabField.fields);
+      });
+    } else if (allowDuplicatesMap[field.name] === undefined) {
+      allowDuplicatesMap[field.name] = !!field.allowDuplicates;
+      return;
+    } else if (!field.allowDuplicates || !allowDuplicatesMap[field.name]) {
+      return field;
+    }
+
+    return;
+  });
+};
+
 var serialize = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(manifest, data, fields) {
-    var depth,
+    var options,
         result,
-        _loop,
-        name,
-        _ret,
+        _options$depth,
+        depth,
+        parentType,
+        flattenedFields,
+        fillResults,
+        parameters,
         hasDuplicateFields,
-        _args3 = arguments;
+        _args2 = arguments;
 
-    return _regenerator.default.wrap(function _callee2$(_context3) {
+    return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
-            depth = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : 0;
+            options = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : {};
             result = [];
+            _options$depth = options.depth, depth = _options$depth === void 0 ? 0 : _options$depth, parentType = options.parentType;
+            flattenedFields = flattenFields(fields);
+            fillResults = flattenedFields.map( /*#__PURE__*/function () {
+              var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(field) {
+                var tabGroupData, tabData, expandData, fieldsetData, value;
+                return _regenerator.default.wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!(0, _extensions.isTabGroup)(field)) {
+                          _context.next = 7;
+                          break;
+                        }
+
+                        _context.next = 3;
+                        return serializeTabGroupField(manifest, field, data);
+
+                      case 3:
+                        tabGroupData = _context.sent;
+                        result.push.apply(result, (0, _toConsumableArray2.default)(tabGroupData));
+                        _context.next = 30;
+                        break;
 
-            if (!data) {
-              _context3.next = 13;
-              break;
-            }
+                      case 7:
+                        if (!(0, _extensions.isTabField)(field)) {
+                          _context.next = 14;
+                          break;
+                        }
 
-            _loop = /*#__PURE__*/_regenerator.default.mark(function _loop(name) {
-              var field, value, tabs, resolveTabValues, i, tabField, fieldSerializer, fieldsetFields, extracted;
-              return _regenerator.default.wrap(function _loop$(_context2) {
-                while (1) {
-                  switch (_context2.prev = _context2.next) {
-                    case 0:
-                      field = fields.find(function (field) {
-                        return field.name === (0, _utils.getNameFromDuplicateField)(name);
-                      });
+                        _context.next = 10;
+                        return serializeTabField(manifest, field, data);
 
-                      if (!(field === undefined)) {
-                        _context2.next = 3;
+                      case 10:
+                        tabData = _context.sent;
+                        result.push.apply(result, (0, _toConsumableArray2.default)(tabData));
+                        _context.next = 30;
                         break;
-                      }
 
-                      return _context2.abrupt("return", "continue");
+                      case 14:
+                        if (!(0, _extensions.isExpand)(field)) {
+                          _context.next = 21;
+                          break;
+                        }
 
-                    case 3:
-                      // ignore undefined values
-                      value = extract(data[name], field);
+                        _context.next = 17;
+                        return serializeExpandField(manifest, field, data);
 
-                      if (!(value === undefined)) {
-                        _context2.next = 6;
+                      case 17:
+                        expandData = _context.sent;
+                        result.push.apply(result, (0, _toConsumableArray2.default)(expandData));
+                        _context.next = 30;
                         break;
-                      }
 
-                      return _context2.abrupt("return", "continue");
+                      case 21:
+                        if (!((0, _extensions.isFieldset)(field) && depth === 0)) {
+                          _context.next = 28;
+                          break;
+                        }
+
+                        _context.next = 24;
+                        return serializeFieldset(manifest, field, data, depth);
 
-                    case 6:
-                      if (!(0, _extensions.isTabGroup)(field)) {
-                        _context2.next = 21;
+                      case 24:
+                        fieldsetData = _context.sent;
+
+                        if (fieldsetData) {
+                          result.push(fieldsetData);
+                        }
+
+                        _context.next = 30;
                         break;
-                      }
 
-                      tabs = field.fields;
-                      value = {};
+                      case 28:
+                        value = extract(data[field.name], field, {
+                          useDefaultValue: true
+                        }); // ignore undefined values
 
-                      resolveTabValues = /*#__PURE__*/function () {
-                        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(tabField, groupData) {
-                          return _regenerator.default.wrap(function _callee$(_context) {
-                            while (1) {
-                              switch (_context.prev = _context.next) {
-                                case 0:
-                                  _context.next = 2;
-                                  return serialize(manifest, groupData[tabField.name] || {}, tabField.fields);
+                        if (value !== undefined) {
+                          result.push((0, _defineProperty2.default)({}, field.name, value));
+                        }
 
-                                case 2:
-                                  return _context.abrupt("return", _context.sent);
+                      case 30:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x4) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+            _context2.next = 7;
+            return Promise.all(fillResults);
+
+          case 7:
+            // Crunch fields down to parameters
+            parameters = result.reduce(function (obj, current) {
+              for (var _key in current) {
+                obj[_key] = current[_key];
+              }
 
-                                case 3:
-                                case "end":
-                                  return _context.stop();
-                              }
-                            }
-                          }, _callee);
-                        }));
+              return obj;
+            }, {}); // Fix up duplicate values (currently only for fieldsets)
 
-                        return function resolveTabValues(_x4, _x5) {
-                          return _ref2.apply(this, arguments);
-                        };
-                      }();
+            hasDuplicateFields = parentType === 'fieldset' && !!flattenedFields.find(function (field) {
+              return field.allowDuplicates;
+            });
 
-                      i = 0;
+            if (!hasDuplicateFields) {
+              _context2.next = 11;
+              break;
+            }
 
-                    case 11:
-                      if (!(i < tabs.length)) {
-                        _context2.next = 19;
-                        break;
-                      }
+            return _context2.abrupt("return", serializeMergeDuplicateFieldData(parameters, data, flattenedFields));
 
-                      tabField = tabs[i];
-                      _context2.next = 15;
-                      return resolveTabValues(tabField, data[field.name] || {});
+          case 11:
+            return _context2.abrupt("return", parameters);
 
-                    case 15:
-                      value[tabField.name] = _context2.sent;
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
 
-                    case 16:
-                      i++;
-                      _context2.next = 11;
-                      break;
+  return function serialize(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
 
-                    case 19:
-                      _context2.next = 37;
-                      break;
+exports.serialize = serialize;
 
-                    case 21:
-                      if (!(0, _extensions.isExpand)(field)) {
-                        _context2.next = 27;
-                        break;
-                      }
+var serializeFieldset = /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(manifest, field, data, depth) {
+    var fieldSerializer, fieldsetFields, fieldParams, extracted;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.prev = 0;
+            _context3.next = 3;
+            return (0, _extensions.getFieldSerializer)(manifest, field.options.transformer);
 
-                      _context2.next = 24;
-                      return serialize(manifest, data[field.name] || {}, field.fields);
+          case 3:
+            fieldSerializer = _context3.sent;
+            _context3.next = 10;
+            break;
 
-                    case 24:
-                      value = _context2.sent;
-                      _context2.next = 37;
-                      break;
+          case 6:
+            _context3.prev = 6;
+            _context3.t0 = _context3["catch"](0);
 
-                    case 27:
-                      if (!((0, _extensions.isFieldset)(field) && depth === 0)) {
-                        _context2.next = 37;
-                        break;
-                      }
+            if (!(data[field.name] !== undefined)) {
+              _context3.next = 10;
+              break;
+            }
 
-                      _context2.next = 30;
-                      return (0, _extensions.getFieldSerializer)(manifest, field.options.transformer);
+            throw _context3.t0;
 
-                    case 30:
-                      fieldSerializer = _context2.sent;
+          case 10:
+            if (fieldSerializer) {
+              _context3.next = 12;
+              break;
+            }
 
-                      if (!fieldSerializer) {
-                        _context2.next = 37;
-                        break;
-                      }
+            return _context3.abrupt("return");
+
+          case 12:
+            fieldsetFields = field.fields;
+            fieldParams = extract(data[field.name], field, {
+              useDefaultValue: true
+            }) || {};
+            _context3.next = 16;
+            return serialize(manifest, fieldParams, fieldsetFields, {
+              depth: depth + 1,
+              parentType: 'fieldset'
+            });
 
-                      fieldsetFields = field.fields;
-                      _context2.next = 35;
-                      return serialize(manifest, value, fieldsetFields, depth + 1);
+          case 16:
+            extracted = _context3.sent;
+            return _context3.abrupt("return", (0, _defineProperty2.default)({}, field.name, fieldSerializer(extracted)));
 
-                    case 35:
-                      extracted = _context2.sent;
-                      value = fieldSerializer(extracted);
+          case 18:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3, null, [[0, 6]]);
+  }));
 
-                    case 37:
-                      result.push((0, _defineProperty2.default)({}, field.name, value));
+  return function serializeFieldset(_x5, _x6, _x7, _x8) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 
-                    case 38:
-                    case "end":
-                      return _context2.stop();
-                  }
-                }
-              }, _loop);
+var serializeExpandField = /*#__PURE__*/function () {
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(manifest, field, data) {
+    var expandData, value, results, fieldName;
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            expandData = field.hasGroupedValues ? data[field.name] || {} : data;
+            _context4.next = 3;
+            return serialize(manifest, expandData, field.fields, {
+              parentType: 'expand'
             });
-            _context3.t0 = _regenerator.default.keys(data);
 
-          case 5:
-            if ((_context3.t1 = _context3.t0()).done) {
-              _context3.next = 13;
-              break;
+          case 3:
+            value = _context4.sent;
+            results = [];
+
+            if (!field.hasGroupedValues) {
+              for (fieldName in value) {
+                results.push((0, _defineProperty2.default)({}, fieldName, value[fieldName]));
+              }
+            } else {
+              results.push((0, _defineProperty2.default)({}, field.name, value));
             }
 
-            name = _context3.t1.value;
-            return _context3.delegateYield(_loop(name), "t2", 8);
+            return _context4.abrupt("return", results);
 
-          case 8:
-            _ret = _context3.t2;
+          case 7:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+
+  return function serializeExpandField(_x9, _x10, _x11) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
+var resolveTabValues = /*#__PURE__*/function () {
+  var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(manifest, tabField, groupData) {
+    var tabFieldParams;
+    return _regenerator.default.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            tabFieldParams = tabField.hasGroupedValues ? groupData[tabField.name] || {} : groupData;
+            _context5.next = 3;
+            return serialize(manifest, tabFieldParams, tabField.fields, {
+              parentType: 'tab'
+            });
+
+          case 3:
+            return _context5.abrupt("return", _context5.sent);
+
+          case 4:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+
+  return function resolveTabValues(_x12, _x13, _x14) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+
+var serializeTabGroupField = /*#__PURE__*/function () {
+  var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(manifest, field, data) {
+    var tabs, results, value, i, tabField, tabFieldParameters, fieldName, _fieldName;
 
-            if (!(_ret === "continue")) {
-              _context3.next = 11;
+    return _regenerator.default.wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            tabs = field.fields;
+            results = [];
+            value = {};
+            i = 0;
+
+          case 4:
+            if (!(i < tabs.length)) {
+              _context6.next = 13;
               break;
             }
 
-            return _context3.abrupt("continue", 5);
+            tabField = tabs[i];
+            _context6.next = 8;
+            return resolveTabValues(manifest, tabField, field.hasGroupedValues ? data[field.name] || {} : data);
 
-          case 11:
-            _context3.next = 5;
+          case 8:
+            tabFieldParameters = _context6.sent;
+
+            if (tabField.hasGroupedValues) {
+              // Keep namespaced by tab
+              value[tabField.name] = tabFieldParameters;
+            } else {
+              // Copy into tabGroup value
+              for (fieldName in tabFieldParameters) {
+                value[fieldName] = tabFieldParameters[fieldName];
+              }
+            }
+
+          case 10:
+            i++;
+            _context6.next = 4;
             break;
 
           case 13:
-            // when there are duplicate fields we return an array eg. [{ title: 'one' }, { title: 'two' }]
-            // when there aren't we return an object eg. { title: 'one' }
-            hasDuplicateFields = !!Object.keys(data).find(function (key) {
-              return (0, _utils.isDuplicateField)(key);
-            });
-
-            if (!hasDuplicateFields) {
-              _context3.next = 16;
-              break;
+            // Now for tabGroup...
+            if (field.hasGroupedValues) {
+              results.push((0, _defineProperty2.default)({}, field.name, value));
+            } else {
+              for (_fieldName in value) {
+                results.push((0, _defineProperty2.default)({}, _fieldName, value));
+              }
             }
 
-            return _context3.abrupt("return", result);
+            return _context6.abrupt("return", results);
 
-          case 16:
-            return _context3.abrupt("return", result.reduce(function (obj, current) {
-              for (var key in current) {
-                obj[key] = current[key];
+          case 15:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+
+  return function serializeTabGroupField(_x15, _x16, _x17) {
+    return _ref7.apply(this, arguments);
+  };
+}();
+
+var serializeTabField = /*#__PURE__*/function () {
+  var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(manifest, field, data) {
+    var results, tabField, tabFieldParameters, fieldName;
+    return _regenerator.default.wrap(function _callee7$(_context7) {
+      while (1) {
+        switch (_context7.prev = _context7.next) {
+          case 0:
+            results = [];
+            tabField = field;
+            _context7.next = 4;
+            return resolveTabValues(manifest, tabField, data);
+
+          case 4:
+            tabFieldParameters = _context7.sent;
+
+            if (tabField.hasGroupedValues) {
+              // Keep namespaced by tab
+              results.push((0, _defineProperty2.default)({}, tabField.name, tabFieldParameters));
+            } else {
+              // Copy into tabGroup value
+              for (fieldName in tabFieldParameters) {
+                results.push((0, _defineProperty2.default)({}, fieldName, tabFieldParameters[fieldName]));
               }
+            }
 
-              return obj;
-            }, {}));
+            return _context7.abrupt("return", results);
 
-          case 17:
+          case 7:
           case "end":
-            return _context3.stop();
+            return _context7.stop();
         }
       }
-    }, _callee2);
+    }, _callee7);
   }));
 
-  return function serialize(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
+  return function serializeTabField(_x18, _x19, _x20) {
+    return _ref8.apply(this, arguments);
   };
 }();
 
-exports.serialize = serialize;
+var serializeMergeDuplicateFieldData = function serializeMergeDuplicateFieldData(parameters, formData, flattenedFields) {
+  // Weed out all the non-duplicate field names
+  var allDuplicateFieldNames = Object.keys(formData).filter(function (key) {
+    return (0, _utils.isDuplicateField)(key);
+  });
+  return flattenedFields.reduce(function (newParams, field) {
+    var paramValue = parameters[field.name];
+
+    if (!field.allowDuplicates && paramValue !== undefined) {
+      newParams[field.name] = paramValue;
+    } else {
+      // extract the given duplicate values through the field
+      var duplicateValues = allDuplicateFieldNames.filter(function (name) {
+        return (0, _utils.getNameFromDuplicateField)(name) === field.name;
+      }).map(function (duplicateFieldName) {
+        return extract(formData[duplicateFieldName], field, {
+          useDefaultValue: true
+        });
+      }); // Merge and ensure that all values are worth serializing
+
+      var mergedValues = [paramValue].concat((0, _toConsumableArray2.default)(duplicateValues)).filter(function (value) {
+        return value !== undefined;
+      });
+
+      if (mergedValues.length > 0) {
+        // Replace so the duplicate field values are saved under the
+        // fieldName as an array
+        newParams[field.name] = mergedValues;
+      }
+    }
+
+    return newParams;
+  }, {});
+};
 
 function injectDefaultValues(data, fields) {
   var copy = (0, _toConsumableArray2.default)(convertToParametersArray(data));
@@ -286,7 +521,7 @@ function injectDefaultValues(data, fields) {
       _step;
 
   try {
-    var _loop2 = function _loop2() {
+    var _loop = function _loop() {
       var field = _step.value;
       var name = field.name;
       var fieldIndex = copy.findIndex(function (item) {
@@ -314,9 +549,9 @@ function injectDefaultValues(data, fields) {
     };
 
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _ret2 = _loop2();
+      var _ret = _loop();
 
-      if (_ret2 === "continue") continue;
+      if (_ret === "continue") continue;
     }
   } catch (err) {
     _iterator.e(err);
@@ -324,200 +559,207 @@ function injectDefaultValues(data, fields) {
     _iterator.f();
   }
 
-  if (doParametersContainDuplicateFields(copy)) {
-    return copy;
-  }
-
   return convertToParametersObject(copy);
 }
+/**
+ * Flattens the given FieldDefinition[] so it resembles the expected data
+ * structure in result Parameters.
+ */
+
+
+var flattenFields = function flattenFields(fields) {
+  var flattenAccumulator = function flattenAccumulator(accumulator, field) {
+    if ((0, _extensions.isTabGroup)(field)) {
+      if (field.hasGroupedValues) {
+        accumulator.push(field);
+      } else {
+        var flattenedTabs = field.fields.reduce(function (tabAccumulator, tab) {
+          return tabAccumulator.concat(tab.hasGroupedValues ? tab : tab.fields.reduce(flattenAccumulator, []));
+        }, []);
+        accumulator.push.apply(accumulator, (0, _toConsumableArray2.default)(flattenedTabs));
+      }
+    } else if ((0, _extensions.isExpand)(field)) {
+      if (field.hasGroupedValues) {
+        accumulator.push(field);
+      } else {
+        var flattenedExpand = field.fields.reduce(flattenAccumulator, []);
+        accumulator.push.apply(accumulator, (0, _toConsumableArray2.default)(flattenedExpand));
+      }
+    } else {
+      accumulator.push(field);
+    }
+
+    return accumulator;
+  };
+
+  return fields.reduce(flattenAccumulator, []);
+};
 
 var deserialize = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(manifest, data, fields) {
+  var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(manifest, data, fields) {
     var depth,
         dataArray,
         result,
         errors,
+        flattenedFields,
         _iterator2,
         _step2,
-        _loop3,
-        _ret3,
-        _args5 = arguments;
+        _loop2,
+        _ret2,
+        _args9 = arguments;
 
-    return _regenerator.default.wrap(function _callee3$(_context5) {
+    return _regenerator.default.wrap(function _callee8$(_context9) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
-            depth = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : 0;
+            depth = _args9.length > 3 && _args9[3] !== undefined ? _args9[3] : 0;
             dataArray = convertToParametersArray(data);
             result = [];
             errors = [];
+            flattenedFields = flattenFields(fields);
             _iterator2 = _createForOfIteratorHelper(dataArray);
-            _context5.prev = 5;
-            _loop3 = /*#__PURE__*/_regenerator.default.mark(function _loop3() {
+            _context9.prev = 6;
+            _loop2 = /*#__PURE__*/_regenerator.default.mark(function _loop2() {
               var item, _Object$entries$, name, originalValue, field, value, fieldDeserializer;
 
-              return _regenerator.default.wrap(function _loop3$(_context4) {
+              return _regenerator.default.wrap(function _loop2$(_context8) {
                 while (1) {
-                  switch (_context4.prev = _context4.next) {
+                  switch (_context8.prev = _context8.next) {
                     case 0:
                       item = _step2.value;
                       _Object$entries$ = (0, _slicedToArray2.default)(Object.entries(item)[0], 2), name = _Object$entries$[0], originalValue = _Object$entries$[1];
-                      field = fields.find(function (field) {
+                      field = flattenedFields.find(function (field) {
                         return field.name === (0, _utils.getNameFromDuplicateField)(name);
                       });
 
                       if (!(field === undefined)) {
-                        _context4.next = 5;
+                        _context8.next = 5;
                         break;
                       }
 
-                      return _context4.abrupt("return", "continue");
+                      return _context8.abrupt("return", "continue");
 
                     case 5:
                       value = extract(originalValue, field);
 
                       if (!(value === undefined)) {
-                        _context4.next = 8;
+                        _context8.next = 8;
                         break;
                       }
 
-                      return _context4.abrupt("return", "continue");
+                      return _context8.abrupt("return", "continue");
 
                     case 8:
                       if (!((0, _extensions.isFieldset)(field) && depth === 0)) {
-                        _context4.next = 24;
+                        _context8.next = 24;
                         break;
                       }
 
-                      _context4.next = 11;
+                      _context8.next = 11;
                       return (0, _extensions.getFieldDeserializer)(manifest, field.options.transformer);
 
                     case 11:
-                      fieldDeserializer = _context4.sent;
+                      fieldDeserializer = _context8.sent;
 
                       if (!fieldDeserializer) {
-                        _context4.next = 24;
+                        _context8.next = 24;
                         break;
                       }
 
-                      _context4.prev = 13;
+                      _context8.prev = 13;
                       value = fieldDeserializer(value);
-                      _context4.next = 21;
+                      _context8.next = 21;
                       break;
 
                     case 17:
-                      _context4.prev = 17;
-                      _context4.t0 = _context4["catch"](13);
-                      errors.push((0, _defineProperty2.default)({}, name, _context4.t0.message));
-                      return _context4.abrupt("return", "continue");
+                      _context8.prev = 17;
+                      _context8.t0 = _context8["catch"](13);
+                      errors.push((0, _defineProperty2.default)({}, name, _context8.t0.message));
+                      return _context8.abrupt("return", "continue");
 
                     case 21:
-                      _context4.next = 23;
+                      _context8.next = 23;
                       return deserialize(manifest, value, field.fields, depth + 1);
 
                     case 23:
-                      value = _context4.sent;
+                      value = _context8.sent;
 
                     case 24:
                       result.push((0, _defineProperty2.default)({}, name, value));
 
                     case 25:
                     case "end":
-                      return _context4.stop();
+                      return _context8.stop();
                   }
                 }
-              }, _loop3, null, [[13, 17]]);
+              }, _loop2, null, [[13, 17]]);
             });
 
             _iterator2.s();
 
-          case 8:
+          case 9:
             if ((_step2 = _iterator2.n()).done) {
-              _context5.next = 15;
+              _context9.next = 16;
               break;
             }
 
-            return _context5.delegateYield(_loop3(), "t0", 10);
+            return _context9.delegateYield(_loop2(), "t0", 11);
 
-          case 10:
-            _ret3 = _context5.t0;
+          case 11:
+            _ret2 = _context9.t0;
 
-            if (!(_ret3 === "continue")) {
-              _context5.next = 13;
+            if (!(_ret2 === "continue")) {
+              _context9.next = 14;
               break;
             }
 
-            return _context5.abrupt("continue", 13);
+            return _context9.abrupt("continue", 14);
 
-          case 13:
-            _context5.next = 8;
+          case 14:
+            _context9.next = 9;
             break;
 
-          case 15:
-            _context5.next = 20;
+          case 16:
+            _context9.next = 21;
             break;
 
-          case 17:
-            _context5.prev = 17;
-            _context5.t1 = _context5["catch"](5);
+          case 18:
+            _context9.prev = 18;
+            _context9.t1 = _context9["catch"](6);
 
-            _iterator2.e(_context5.t1);
+            _iterator2.e(_context9.t1);
 
-          case 20:
-            _context5.prev = 20;
+          case 21:
+            _context9.prev = 21;
 
             _iterator2.f();
 
-            return _context5.finish(20);
+            return _context9.finish(21);
 
-          case 23:
+          case 24:
             result = convertToParametersObject(result);
 
             if (errors.length > 0) {
               result.errors = convertToParametersObject(errors);
             }
 
-            return _context5.abrupt("return", injectDefaultValues(result, fields));
+            return _context9.abrupt("return", injectDefaultValues(result, flattenedFields));
 
-          case 26:
+          case 27:
           case "end":
-            return _context5.stop();
+            return _context9.stop();
         }
       }
-    }, _callee3, null, [[5, 17, 20, 23]]);
+    }, _callee8, null, [[6, 18, 21, 24]]);
   }));
 
-  return function deserialize(_x6, _x7, _x8) {
-    return _ref3.apply(this, arguments);
+  return function deserialize(_x21, _x22, _x23) {
+    return _ref9.apply(this, arguments);
   };
 }();
 
 exports.deserialize = deserialize;
 
-var doParametersContainDuplicateFields = function doParametersContainDuplicateFields(parameters) {
-  var keyMap = new Set();
-
-  var _iterator3 = _createForOfIteratorHelper(parameters),
-      _step3;
-
-  try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var param = _step3.value;
-      var key = Object.keys(param)[0];
-
-      if (keyMap.has(key)) {
-        return true;
-      }
-
-      keyMap.add(key);
-    }
-  } catch (err) {
-    _iterator3.e(err);
-  } finally {
-    _iterator3.f();
-  }
-};
-
 var convertToParametersObject = function convertToParametersObject() {
   var parameters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
 
@@ -526,17 +768,17 @@ var convertToParametersObject = function convertToParametersObject() {
   }
 
   return parameters.reduce(function (obj, current) {
-    for (var key in current) {
+    for (var _key2 in current) {
       var keys = Object.keys(obj);
-      var resultKey = key;
+      var resultKey = _key2;
       var idx = 1;
 
       while (keys.indexOf(resultKey) >= 0) {
-        resultKey = "".concat((0, _utils.getNameFromDuplicateField)(key), ":").concat(idx);
+        resultKey = "".concat((0, _utils.getNameFromDuplicateField)(_key2), ":").concat(idx);
         idx++;
       }
 
-      obj[resultKey] = current[key];
+      obj[resultKey] = current[_key2];
     }
 
     return obj;