Mend ability to serialize primitives in request body object values

swagger-api · Dec 7, 2017 · 917fe74 · 917fe74
1 parent e4d5097
commit 917fe74
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/http.js b/src/http.js
@@ -140,8 +140,12 @@ function isFile(obj) {
   return obj !== null && typeof obj === 'object' && typeof obj.pipe === 'function'
 }
 
-function formatValue({value, collectionFormat, allowEmptyValue}, skipEncoding) {
-  // REVIEW: OAS3: usage of this fn for compatibility w/ new value formats
+function formatValue(input, skipEncoding) {
+  const {collectionFormat, allowEmptyValue} = input
+
+  // `input` can be string in OAS3 contexts
+  const value = typeof input === 'object' ? input.value : input
+
   const SEPARATORS = {
     csv: ',',
     ssv: '%20',
@@ -163,9 +167,14 @@ function formatValue({value, collectionFormat, allowEmptyValue}, skipEncoding) {
     else encodeFn = obj => JSON.stringify(obj)
   }
 
-  if (value && !Array.isArray(value)) {
+  if (typeof value === 'object' && !Array.isArray(value)) {
+    return ''
+  }
+
+  if (!Array.isArray(value)) {
     return encodeFn(value)
   }
+
   if (Array.isArray(value) && !collectionFormat) {
     return value.map(encodeFn).join(',')
   }

diff --git a/test.js b/test.js
diff --git a/test/http.js b/test/http.js
@@ -221,6 +221,16 @@ describe('http', () => {
       expect(encodeFormOrQuery(req.query)).toEqual('one=1&two=2&three=false')
     })
 
+    it('should parse a generic object into a query string', function () {
+      const data = {
+        one: 1,
+        two: 'two',
+        three: false
+      }
+
+      expect(encodeFormOrQuery(data)).toEqual('one=1&two=two&three=false')
+    })
+
     it('should handle arrays', function () {
       const req = {
         query: {