fixed issue with skipEmpty and nested input value #25

brainfoolong · Feb 9, 2022 · a937648 · a937648
1 parent adacd63
commit a937648
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
+### 2.1.2 - 2022-02-09
+
+* fixed issue with skipEmpty and nested input value #25
+
 ### 2.1.1 - 06.December 2021
 
-* accept a `$` instance also as html element in `toJson/fromJson`, which is used by many libraries that memic jquery behaviour - previously only explicitly `jQuery` was supported
+* accept a `$` instance also as html element in `toJson/fromJson`, which is used by many libraries that memic jquery
+  behaviour - previously only explicitly `jQuery` was supported
 
 
 * ### 2.1.0 - 24.October 2021

diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ You can edit this defaults globally by modifying `FormDataJson.defaultOptionsToJ
 'flatList': false,
 
 /**
- * If true, than this does skip empty fields from the output
+ * If true, then this does skip empty fields from the output
  * Empty is considered to be:
  * An empty array (for multiple selects/checkboxes)
  * An empty input field (length = 0)

diff --git a/dist/form-data-json.js b/dist/form-data-json.js
@@ -1,5 +1,5 @@
 'use strict';
-// form-data-json-convert | version: 2.1.1 | url: https://github.com/brainfoolong/form-data-json
+// form-data-json-convert | version: 2.1.2 | url: https://github.com/brainfoolong/form-data-json
 
 /**
  * Form Data Json Converter
@@ -209,6 +209,7 @@ var FormDataJson = /*#__PURE__*/function () {
      * Recursively remove empty keys
      * @param {Object} object
      * @param {number} depth
+     * @return {Object|Array}
      */
 
 
@@ -233,7 +234,7 @@ var FormDataJson = /*#__PURE__*/function () {
         }
 
         if (isArray) {
-          newObject.push(object[key]);
+          newObject.push(options.flatList && !depth ? [object[key][0], value] : value);
         } else {
           newObject[key] = value;
         }
@@ -690,7 +691,7 @@ var FormDataJson = /*#__PURE__*/function () {
   ;
 
   FormDataJson.isArray = function isArray(arg) {
-    return typeof arg === 'object' && Object.prototype.toString.call(arg) === '[object Array]';
+    return Array.isArray(arg);
   }
   /**
    * Get html element out of given parameter
@@ -772,7 +773,7 @@ FormDataJson.defaultOptionsToJson = {
   'flatList': false,
 
   /**
-   * If true, than this does skip empty fields from the output
+   * If true, then this does skip empty fields from the output
    * Empty is considered to be:
    * An empty array (for multiple selects/checkboxes)
    * An empty input field (length = 0)

diff --git a/dist/form-data-json.min.js b/dist/form-data-json.min.js
diff --git a/docs/scripts/form-data-json.js b/docs/scripts/form-data-json.js
@@ -1,5 +1,5 @@
 'use strict';
-// form-data-json-convert | version: 2.1.1 | url: https://github.com/brainfoolong/form-data-json
+// form-data-json-convert | version: 2.1.2 | url: https://github.com/brainfoolong/form-data-json
 
 /**
  * Form Data Json Converter
@@ -209,6 +209,7 @@ var FormDataJson = /*#__PURE__*/function () {
      * Recursively remove empty keys
      * @param {Object} object
      * @param {number} depth
+     * @return {Object|Array}
      */
 
 
@@ -233,7 +234,7 @@ var FormDataJson = /*#__PURE__*/function () {
         }
 
         if (isArray) {
-          newObject.push(object[key]);
+          newObject.push(options.flatList && !depth ? [object[key][0], value] : value);
         } else {
           newObject[key] = value;
         }
@@ -690,7 +691,7 @@ var FormDataJson = /*#__PURE__*/function () {
   ;
 
   FormDataJson.isArray = function isArray(arg) {
-    return typeof arg === 'object' && Object.prototype.toString.call(arg) === '[object Array]';
+    return Array.isArray(arg);
   }
   /**
    * Get html element out of given parameter
@@ -772,7 +773,7 @@ FormDataJson.defaultOptionsToJson = {
   'flatList': false,
 
   /**
-   * If true, than this does skip empty fields from the output
+   * If true, then this does skip empty fields from the output
    * Empty is considered to be:
    * An empty array (for multiple selects/checkboxes)
    * An empty input field (length = 0)