Comparing version 0.9.0 to 0.10.0
@@ -7,7 +7,6 @@ import { Server, IncomingMessage, ServerResponse } from 'http' | ||
declare const createAdapter: (handler: Handler) => AxiosAdapter | ||
declare const axiosist: (handler: Handler) => AxiosInstance & { | ||
createAdapter: typeof createAdapter | ||
} | ||
declare const axiosist: (handler: Handler) => AxiosInstance | ||
export = axiosist | ||
export default axiosist | ||
export const createAdapter: (handler: Handler) => AxiosAdapter | ||
export { AxiosAdapter, AxiosInstance } |
58
index.js
/** | ||
* @typedef {import('net').AddressInfo} AddressInfo | ||
* @typedef {import('http').Server} Server | ||
* @typedef {import('http').IncomingMessage} IncomingMessage | ||
@@ -54,22 +53,38 @@ * @typedef {import('http').ServerResponse} ServerResponse | ||
let promise = listening | ||
? Promise.resolve() | ||
: new Promise(resolve => server.listen(0, '127.0.0.1', resolve)) | ||
promise = promise.then(() => { | ||
const address = /** @type {AddressInfo} */(server.address()) | ||
url.host = '127.0.0.1' | ||
url.port = address.port.toString() | ||
config[urlField] = url.toString() | ||
return defaultAdapter(config) | ||
}) | ||
if (listening) { | ||
promise.then(resolve, reject) | ||
} else { | ||
promise.then( | ||
value => server.close(() => resolve(value)), | ||
reason => server.close(() => reject(reason)) | ||
) | ||
} | ||
resolve(/** @type {Promise<void>} */ ( | ||
new Promise(resolve => { | ||
if (listening) { | ||
resolve() | ||
} else { | ||
server.listen(0, '127.0.0.1', resolve) | ||
} | ||
}) | ||
).then( | ||
() => { | ||
const address = /** @type {AddressInfo} */(server.address()) | ||
url.host = '127.0.0.1' | ||
url.port = address.port.toString() | ||
config[urlField] = url.toString() | ||
return defaultAdapter(config) | ||
} | ||
).then( | ||
(response) => { | ||
if (listening) { | ||
return response | ||
} else { | ||
return new Promise(resolve => { | ||
server.close(() => resolve(response)) | ||
}) | ||
} | ||
}, | ||
(error) => { | ||
if (listening) { | ||
throw error | ||
} else { | ||
return new Promise((resolve, reject) => { | ||
server.close(() => reject(error)) | ||
}) | ||
} | ||
} | ||
)) | ||
}) | ||
@@ -90,2 +105,3 @@ | ||
module.exports = axiosist | ||
module.exports.default = axiosist | ||
module.exports.createAdapter = createAdapter |
{ | ||
"name": "axiosist", | ||
"version": "0.9.0", | ||
"version": "0.10.0", | ||
"description": "Convert node.js request handler to axios adapter", | ||
@@ -37,3 +37,3 @@ "main": "index.js", | ||
"@types/node": ">=10.13.0", | ||
"axios": "^0.19.1" | ||
"axios": "^0.21.0" | ||
}, | ||
@@ -43,5 +43,5 @@ "devDependencies": { | ||
"nyc": "^15.0.0", | ||
"standard": "^14.3.1", | ||
"typescript": "^3.4.5" | ||
"standard": "^16.0.1", | ||
"typescript": "~4.1.3" | ||
} | ||
} |
@@ -8,3 +8,2 @@ # axiosist | ||
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) | ||
[![Greenkeeper badge](https://badges.greenkeeper.io/Gerhut/axiosist.svg)](https://greenkeeper.io/) | ||
@@ -11,0 +10,0 @@ [Axios][axios] based supertest: convert node.js request handler to [axios][axios] adapter, used for node.js server unit test. |
8697
100
130
+ Addedaxios@0.21.4(transitive)
+ Addedfollow-redirects@1.15.9(transitive)
- Removedaxios@0.19.2(transitive)
- Removedfollow-redirects@1.5.10(transitive)
Updatedaxios@^0.21.0