fixed #16 in toJson() in combination with skipEmpty and flatList

brainfoolong · Sep 27, 2021 · 8d2c3e5 · 8d2c3e5
1 parent 0361d0a
commit 8d2c3e5
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 2.0.4beta - 27.09.2021
+* fixed https://github.com/brainfoolong/form-data-json/issues/16 in `toJson()` in combination with `skipEmpty` and `flatList`
+
 ### 2.0.3beta - 27.09.2021
 * fixed https://github.com/brainfoolong/form-data-json/issues/13 in `toJson()`
 * changed option `uncheckedValue` is now false by default, instead of undefined

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.0.3beta | url: https://github.com/brainfoolong/form-data-json
+// form-data-json-convert | version: 2.0.4beta | url: https://github.com/brainfoolong/form-data-json
 
 /**
  * Form Data Json Converter
@@ -204,33 +204,40 @@ var FormDataJson = /*#__PURE__*/function () {
 
     function output() {
       returnObject = arrayfy(returnObject);
-      if (options.skipEmpty) returnObject = removeEmpty(returnObject) || {};
+      if (options.skipEmpty) returnObject = removeEmpty(returnObject) || (options.flatList ? [] : {});
       return returnObject;
     }
     /**
      * Recursively remove empty keys
      * @param {Object} object
+     * @param {number} depth
      */
 
 
-    function removeEmpty(object) {
+    function removeEmpty(object, depth) {
       var isArray = FormDataJson.isArray(object);
       var newObject = isArray ? [] : {};
       var count = 0;
 
       for (var key in object) {
-        if (FormDataJson.isObject(object[key]) || FormDataJson.isArray(object[key])) {
-          object[key] = removeEmpty(object[key]) || '';
+        var value = object[key];
+
+        if (options.flatList && !depth) {
+          value = value[1];
+        }
+
+        if (FormDataJson.isObject(value) || FormDataJson.isArray(value)) {
+          value = removeEmpty(value, (depth || 0) + 1) || '';
         }
 
-        if (typeof object[key] !== 'object' && FormDataJson.stringify(object[key]) === '') {
+        if (typeof value !== 'object' && FormDataJson.stringify(value) === '') {
           continue;
         }
 
         if (isArray) {
-          newObject.push(object[key]);
+          newObject.push(value);
         } else {
-          newObject[key] = object[key];
+          newObject[key] = value;
         }
 
         count++;

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.0.3beta | url: https://github.com/brainfoolong/form-data-json
+// form-data-json-convert | version: 2.0.4beta | url: https://github.com/brainfoolong/form-data-json
 
 /**
  * Form Data Json Converter
@@ -204,33 +204,40 @@ var FormDataJson = /*#__PURE__*/function () {
 
     function output() {
       returnObject = arrayfy(returnObject);
-      if (options.skipEmpty) returnObject = removeEmpty(returnObject) || {};
+      if (options.skipEmpty) returnObject = removeEmpty(returnObject) || (options.flatList ? [] : {});
       return returnObject;
     }
     /**
      * Recursively remove empty keys
      * @param {Object} object
+     * @param {number} depth
      */
 
 
-    function removeEmpty(object) {
+    function removeEmpty(object, depth) {
       var isArray = FormDataJson.isArray(object);
       var newObject = isArray ? [] : {};
       var count = 0;
 
       for (var key in object) {
-        if (FormDataJson.isObject(object[key]) || FormDataJson.isArray(object[key])) {
-          object[key] = removeEmpty(object[key]) || '';
+        var value = object[key];
+
+        if (options.flatList && !depth) {
+          value = value[1];
+        }
+
+        if (FormDataJson.isObject(value) || FormDataJson.isArray(value)) {
+          value = removeEmpty(value, (depth || 0) + 1) || '';
         }
 
-        if (typeof object[key] !== 'object' && FormDataJson.stringify(object[key]) === '') {
+        if (typeof value !== 'object' && FormDataJson.stringify(value) === '') {
           continue;
         }
 
         if (isArray) {
-          newObject.push(object[key]);
+          newObject.push(value);
         } else {
-          newObject[key] = object[key];
+          newObject[key] = value;
         }
 
         count++;