revert irrelevant files

ljharb · Jan 15, 2020 · b10b3fc · b10b3fc
1 parent 8166a0e
commit b10b3fc
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,3 @@ dist/*
 yarn.lock
 package-lock.json
 npm-shrinkwrap.json
-
-# IDE related
-.idea
diff --git a/dist/qs.js b/dist/qs.js
@@ -243,7 +243,7 @@ var normalizeParseOptions = function normalizeParseOptions(opts) {
     }
 
     if (typeof opts.charset !== 'undefined' && opts.charset !== 'utf-8' && opts.charset !== 'iso-8859-1') {
-        throw new TypeError('The charset option must be either utf-8, iso-8859-1, or undefined');
+        throw new Error('The charset option must be either utf-8, iso-8859-1, or undefined');
     }
     var charset = typeof opts.charset === 'undefined' ? defaults.charset : opts.charset;
 
@@ -366,6 +366,8 @@ var stringify = function stringify(
         obj = filter(prefix, obj);
     } else if (obj instanceof Date) {
         obj = serializeDate(obj);
+    } else if (generateArrayPrefix === 'comma' && isArray(obj)) {
+        obj = obj.join(',');
     }
 
     if (obj === null) {
@@ -392,44 +394,52 @@ var stringify = function stringify(
 
     var objKeys;
     if (isArray(filter)) {
-        objKeys = filter; // objKeys is array
+        objKeys = filter;
     } else {
         var keys = Object.keys(obj);
-        objKeys = sort ? keys.sort(sort) : keys; // objKeys is array of keys
-    }
-
-    if (isArray(obj) && generateArrayPrefix === 'comma') {
-        // we need to join elements in
-        objKeys = [{ value: obj.length > 0 ? obj.join(',') || null : undefined }];
+        objKeys = sort ? keys.sort(sort) : keys;
     }
 
     for (var i = 0; i < objKeys.length; ++i) {
         var key = objKeys[i];
-        var value = typeof key === 'object' && key.value !== undefined ? key.value : obj[key];
 
-        if (skipNulls && value === null) {
+        if (skipNulls && obj[key] === null) {
             continue;
         }
 
-        var keyPrefix = isArray(obj)
-            ? typeof generateArrayPrefix === 'function' ? generateArrayPrefix(prefix, key) : prefix
-            : prefix + (allowDots ? '.' + key : '[' + key + ']');
-
-        pushToArray(values, stringify(
-            value,
-            keyPrefix,
-            generateArrayPrefix,
-            strictNullHandling,
-            skipNulls,
-            encoder,
-            filter,
-            sort,
-            allowDots,
-            serializeDate,
-            formatter,
-            encodeValuesOnly,
-            charset
-        ));
+        if (isArray(obj)) {
+            pushToArray(values, stringify(
+                obj[key],
+                typeof generateArrayPrefix === 'function' ? generateArrayPrefix(prefix, key) : prefix,
+                generateArrayPrefix,
+                strictNullHandling,
+                skipNulls,
+                encoder,
+                filter,
+                sort,
+                allowDots,
+                serializeDate,
+                formatter,
+                encodeValuesOnly,
+                charset
+            ));
+        } else {
+            pushToArray(values, stringify(
+                obj[key],
+                prefix + (allowDots ? '.' + key : '[' + key + ']'),
+                generateArrayPrefix,
+                strictNullHandling,
+                skipNulls,
+                encoder,
+                filter,
+                sort,
+                allowDots,
+                serializeDate,
+                formatter,
+                encodeValuesOnly,
+                charset
+            ));
+        }
     }
 
     return values;