Updated scripts

This commit is contained in:
delvedor
2018-12-12 16:47:09 +01:00
parent ab90797b65
commit 7c1b58d703
2 changed files with 22 additions and 11 deletions

View File

@ -16,12 +16,12 @@ function genFactory (folder) {
.reduce((acc, val) => {
const obj = {
[val]: acc === null
? 'apiMethod'
? 'ApiMethod'
: acc
}
if (isSnakeCased(val)) {
obj[camelify(val)] = acc === null
? 'apiMethod'
? 'ApiMethod'
: acc
}
return obj
@ -93,11 +93,11 @@ function genFactory (folder) {
// of js closures to have a simple cache with the least overhead.
function lazyLoad (file, opts) {
var fn = null
return function _lazyLoad (params, callback) {
return function _lazyLoad (params, options, callback) {
if (fn === null) {
fn = require(file)(opts)
}
return fn(params, callback)
return fn(params, options, callback)
}
}

View File

@ -66,15 +66,21 @@ function generate (spec, common) {
}
const code = `
function ${safeWords(name)} (params, callback) {
function ${safeWords(name)} (params, options, callback) {
options = options || {}
if (typeof options === 'function') {
callback = options
options = {}
}
if (typeof params === 'function' || params == null) {
callback = params
params = {}
options = {}
}
// promises support
if (callback == null) {
return new Promise((resolve, reject) => {
${safeWords(name)}(params, (err, body) => {
${safeWords(name)}(params, options, (err, body) => {
err ? reject(err) : resolve(body)
})
})
@ -120,7 +126,7 @@ function generate (spec, common) {
)
}
var ignore = params.ignore || null
var ignore = options.ignore || null
if (typeof ignore === 'number') {
ignore = [ignore]
}
@ -132,12 +138,17 @@ function generate (spec, common) {
${buildPath(api)}
querystring,
${genBody(api, methods, spec[api].body)}
headers: params.headers || null,
ignore,
requestTimeout: params.requestTimeout || null
headers: params.headers || null
}
return makeRequest(request, callback)
const requestOptions = {
ignore,
requestTimeout: options.requestTimeout || null,
maxRetries: options.maxRetries || null,
asStream: options.asStream || false
}
return makeRequest(request, requestOptions, callback)
}
`.trim() // always call trim to avoid newlines