More WIP

Author: shockey

src/execute/oas3/parameter-builders.js

@@ -34,8 +34,9 @@ function query({req, value, parameter}) {
         key: parameter.name,
         value,
         style: parameter.style || 'form',
-        explode: parameter.explode || true
-      })
+        explode: typeof parameter.explode === 'undefined' ? true : parameter.explode
+      }),
+      skipEncoding: true
     }
   }
   else if (parameter.allowEmptyValue) {

src/execute/oas3/style-serializer.js

@@ -11,13 +11,17 @@ export default function (config) {
   return encodePrimitive(config)
 }
 
-function encodeArray({key, value, style, explode}) {
+const escape = str => encodeURIComponent(str)
+
+function encodeArray({key, value, style, explode, parameter}) {
   if (style === 'simple') {
     return value.join(',')
   }
+
   if (style === 'label') {
     return `.${value.join('.')}`
   }
+
   if (style === 'matrix') {
     return value.reduce((prev, curr) => {
       if (!prev || explode) {
@@ -26,8 +30,20 @@ function encodeArray({key, value, style, explode}) {
       return `${prev},${curr}`
     }, '')
   }
+
   if (style === 'form') {
-    return value.join(',')
+    const after = explode ? `&${key}=` : escape(',')
+    return value.join(after)
+  }
+
+  if (style === 'spaceDelimited') {
+    const after = explode ? `${key}=` : ''
+    return value.join(`${escape(' ')}${after}`)
+  }
+
+  if (style === 'pipeDelimited') {
+    const after = explode ? `${key}=` : ''
+    return value.join(`${escape('|')}${after}`)
   }
 }
 
@@ -72,18 +88,30 @@ function encodeObject({key, value, style, explode}) {
       return `${prefix}${curr},${val}`
     }, '')
   }
+
+  if (style === 'form') {
+    return valueKeys.reduce((prev, curr) => {
+      const val = value[curr]
+      const prefix = prev ? `${prev}&` : ''
+
+      return `${prefix}${curr}=${val}`
+    }, '')
+  }
 }
 
 function encodePrimitive({key, value, style, explode}) {
   if (style === 'simple') {
     return value
   }
+
   if (style === 'label') {
     return `.${value}`
   }
+
   if (style === 'matrix') {
     return `;${key}=${value}`
   }
+
   if (style === 'form') {
     return value
   }

src/http.js

@@ -180,9 +180,10 @@ export function encodeFormOrQuery(data) {
   const encodedQuery = Object.keys(data).reduce((result, parameterName) => {
     const isObject = a => a && typeof a === 'object'
     const paramValue = data[parameterName]
+    const skipEncoding = !!paramValue.skipEncoding
     const encodedParameterName = encodeURIComponent(parameterName)
     const notArray = isObject(paramValue) && !Array.isArray(paramValue)
-    result[encodedParameterName] = formatValue(notArray ? paramValue : {value: paramValue})
+    result[encodedParameterName] = formatValue(notArray ? paramValue : {value: paramValue}, skipEncoding)
     return result
   }, {})
   return qs.stringify(encodedQuery, {encode: false, indices: false}) || ''

test/oas3/execute/style-explode.js

@@ -2,6 +2,7 @@ import expect, {createSpy, spyOn} from 'expect'
 import xmock from 'xmock'
 import path from 'path'
 import fs from 'fs'
+import qs from 'querystring'
 import jsYaml from 'js-yaml'
 
 import {execute, buildRequest, baseUrl, applySecurities, self as stubs} from '../../../src/execute'
@@ -11,7 +12,7 @@ const petstoreSpec = jsYaml.safeLoad(fs.readFileSync(path.join('test', 'oas3', '
 // Supported shape...  { spec, operationId, parameters, securities, fetch }
 // One can use operationId or pathItem + method
 
-describe('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', function () {
+describe.only('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', function () {
   describe('path parameters', function () {
     describe('primitive values', function () {
       it('default: should build a path parameter in a simple/no-explode format', function () {
@@ -1055,7 +1056,7 @@ describe('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', func
 
         expect(req).toEqual({
           method: 'GET',
-          url: '/users?id=3,4,5',
+          url: '/users?id=3%2C4%2C5',
           credentials: 'same-origin',
           headers: {},
         })
@@ -1169,7 +1170,7 @@ describe('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', func
 
         expect(req).toEqual({
           method: 'GET',
-          url: '/users?id=3|id=4|id=5',
+          url: '/users?id=3%7Cid=4%7Cid=5',
           credentials: 'same-origin',
           headers: {},
         })
@@ -1207,13 +1208,13 @@ describe('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', func
 
         expect(req).toEqual({
           method: 'GET',
-          url: '/users?id=3|4|5',
+          url: '/users?id=3%7C4%7C5',
           credentials: 'same-origin',
           headers: {},
         })
       })
     })
-    describe.skip('object values', function () {
+    describe('object values', function () {
       const VALUE = {
         role: 'admin',
         firstName: 'Alex'