Comparing version 1.0.13 to 1.0.14
{ | ||
"name": "eosjs-api", | ||
"version": "1.0.13", | ||
"version": "1.0.14", | ||
"description": "Application programming interface to EOS blockchain nodes.", | ||
@@ -5,0 +5,0 @@ "scripts": { |
@@ -14,3 +14,3 @@ require('isomorphic-fetch') | ||
function apiGen (version, definitions, config) { | ||
config = Object.assign(configDefaults, config) | ||
config = Object.assign({}, configDefaults, config) | ||
const api = {} | ||
@@ -17,0 +17,0 @@ const {httpEndpoint} = config |
@@ -72,3 +72,3 @@ module.exports = processArgs | ||
if(typeof optionsFormatter === 'function' && args.length > 0 && | ||
(typeof args[0] === 'object' || args.length === expectedArgCount + 1) | ||
((typeof args[0] === 'object' && args.length === 2) || args.length === expectedArgCount + 1) | ||
) { | ||
@@ -75,0 +75,0 @@ //An extra options argument |
@@ -38,5 +38,4 @@ /* eslint-env mocha */ | ||
const r = processArgs(argsOption, argNames, 'method', optionsFormatter) | ||
assert.equal(r.params.arg1, 1) | ||
assert.equal(r.params.arg2, 2) | ||
assert.equal(r.options.options, true) | ||
assert.deepEqual(r.params, {arg1: 1, arg2: 2}) | ||
assert.deepEqual(r.options, {options: true}) | ||
}) | ||
@@ -49,4 +48,3 @@ | ||
const r = processArgs(argsCallback, argNames) | ||
assert.equal(r.params.arg1, 1) | ||
assert.equal(r.params.arg2, 2) | ||
assert.deepEqual(r.params, {arg1: 1, arg2: 2}) | ||
r.callback() | ||
@@ -60,4 +58,3 @@ }) | ||
const r = processArgs(argsCallback, argNames) | ||
assert.equal(r.params.arg1, 1) | ||
assert.equal(r.params.arg2, 2) | ||
assert.deepEqual(r.params, {arg1: 1, arg2: 2}) | ||
r.callback('error') | ||
@@ -73,4 +70,3 @@ r.returnPromise.catch(error => {done()}) | ||
const r = processArgs(argsOptionCallback, argNames, 'method', optionsFormatter) | ||
assert.equal(r.params.arg1, 1) | ||
assert.equal(r.params.arg2, 2) | ||
assert.deepEqual(r.params, {arg1: 1, arg2: 2}) | ||
assert.equal(r.options.options, true) | ||
@@ -86,4 +82,3 @@ r.callback() | ||
const r = processArgs(argsOptionCallback, argNames, 'method', optionsFormatter) | ||
assert.equal(r.params.arg1, 1) | ||
assert.equal(r.params.arg2, 2) | ||
assert.deepEqual(r.params, {arg1: 1, arg2: 2}) | ||
assert.equal(r.options.options, true) | ||
@@ -93,2 +88,12 @@ r.callback() | ||
it('object with missing options', () => { | ||
const argsOptionCallback = [{arg1: 1, arg2: 2}] | ||
const optionsFormatter = option => option | ||
const r = processArgs(argsOptionCallback, argNames, 'method', optionsFormatter) | ||
assert.deepEqual(r.params, {arg1: 1, arg2: 2}) | ||
r.callback() | ||
return r.returnPromise | ||
}) | ||
}) | ||
@@ -95,0 +100,0 @@ |
@@ -17,4 +17,4 @@ const apiGen = require('./src/apigen') | ||
function Testnet (config) { | ||
config = Object.assign(configDefaults, config) | ||
config = Object.assign({}, configDefaults, config) | ||
return apiGen(API_VERSION, Testnet.api, config) | ||
} |
15635
372