Query parameters... working

Author: Kyle Shockey

src/execute/oas3/parameter-builders.js

@@ -2,7 +2,8 @@ import stylize from './style-serializer'
 
 export default {
   path,
-  query
+  query,
+  header
 }
 
 function path({req, value, parameter}) {
@@ -29,14 +30,52 @@ function query({req, value, parameter}) {
   }
 
   if (value) {
-    req.query[parameter.name] = {
-      value: stylize({
-        key: parameter.name,
-        value,
-        style: parameter.style || 'form',
-        explode: typeof parameter.explode === 'undefined' ? true : parameter.explode
-      }),
-      skipEncoding: true
+    const type = typeof value
+
+    if (parameter.style === 'deepObject') {
+      const valueKeys = Object.keys(value)
+      valueKeys.forEach(k => {
+        const v = value[k]
+        req.query[`${parameter.name}[${k}]`] = {
+          value: stylize({
+            key: k,
+            value: v,
+            style: 'deepObject'
+          }),
+          skipEncoding: true
+        }
+      })
+    }
+    else if (
+      type === "object" &&
+      !Array.isArray(value) &&
+      (parameter.style === 'form' || !parameter.style) &&
+      (parameter.explode || parameter.explode === undefined)
+    ) {
+      // form explode needs to be handled here,
+      // since we aren't assigning to `req.query[parameter.name]`
+      // like we usually do.
+      const valueKeys = Object.keys(value)
+      valueKeys.forEach(k => {
+        const v = value[k]
+        req.query[k] = {
+          value: stylize({
+            key: k,
+            value: v,
+            style: parameter.style || 'form'
+          })
+        }
+      })
+    } else {
+      req.query[parameter.name] = {
+        value: stylize({
+          key: parameter.name,
+          value,
+          style: parameter.style || 'form',
+          explode: typeof parameter.explode === 'undefined' ? true : parameter.explode
+        }),
+        skipEncoding: true
+      }
     }
   }
   else if (parameter.allowEmptyValue) {
@@ -45,3 +84,15 @@ function query({req, value, parameter}) {
     req.query[paramName].allowEmptyValue = true
   }
 }
+
+function header({req, parameter, value}) {
+  req.headers = req.headers || {}
+  if (typeof value !== 'undefined') {
+    req.headers[parameter.name] = stylize({
+      key: parameter.name,
+      value,
+      style: parameter.style || 'simple',
+      explode: typeof parameter.explode || false
+    })
+  }
+}

src/execute/oas3/style-serializer.js

@@ -92,9 +92,9 @@ function encodeObject({key, value, style, explode}) {
   if (style === 'form') {
     return valueKeys.reduce((prev, curr) => {
       const val = value[curr]
-      const prefix = prev ? `${prev}&` : ''
+      const prefix = prev ? `${prev},` : ``
 
-      return `${prefix}${curr}=${val}`
+      return `${prefix}${curr},${val}`
     }, '')
   }
 }
@@ -115,4 +115,8 @@ function encodePrimitive({key, value, style, explode}) {
   if (style === 'form') {
     return value
   }
+
+  if (style === 'deepObject') {
+    return value
+  }
 }

src/http.js

@@ -181,7 +181,7 @@ export function encodeFormOrQuery(data) {
     const isObject = a => a && typeof a === 'object'
     const paramValue = data[parameterName]
     const skipEncoding = !!paramValue.skipEncoding
-    const encodedParameterName = encodeURIComponent(parameterName)
+    const encodedParameterName = skipEncoding ? parameterName : encodeURIComponent(parameterName)
     const notArray = isObject(paramValue) && !Array.isArray(paramValue)
     result[encodedParameterName] = formatValue(notArray ? paramValue : {value: paramValue}, skipEncoding)
     return result

test/oas3/execute/style-explode.js

@@ -1294,6 +1294,44 @@ describe.only('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0',
         })
       })
 
+      it('should build a query parameter in form/no-explode format', function () {
+        // Given
+        const spec = {
+          openapi: '3.0.0',
+          paths: {
+            '/users': {
+              get: {
+                operationId: 'myOperation',
+                parameters: [
+                  {
+                    name: 'id',
+                    in: 'query',
+                    style: 'form',
+                    explode: false
+                  }
+                ]
+              }
+            }
+          }
+        }
+
+        // when
+        const req = buildRequest({
+          spec,
+          operationId: 'myOperation',
+          parameters: {
+            id: VALUE
+          }
+        })
+
+        expect(req).toEqual({
+          method: 'GET',
+          url: '/users?id=role,admin,firstName,Alex',
+          credentials: 'same-origin',
+          headers: {},
+        })
+      })
+
       it('should build a query parameter in deepObject/explode format', function () {
         // Given
         const spec = {