mirror of
https://github.com/tenrok/axios.git
synced 2026-06-17 19:21:29 +03:00
Liuwei1125
847d89b436
* fix(buildURL): support URL object as input Fixes #6546 When passing a URL object (e.g., new URL(...)) to axios methods like axios.get(url, { params: {...} }), the buildURL function would crash with 'url.indexOf is not a function' because it assumed url was always a string. This fix converts URL objects to strings before processing. * fix: support URL object as config.url input - Move URL object coercion from buildURL to Axios._request so that all downstream consumers (buildFullPath, combineURLs, adapters) see a string. This fixes the crash when using URL object with baseURL (combineURLs calls .replace() on the URL object). - Remove the broken buildURL unit test that tested buildURL(url, null) without actually exercising URL coercion (buildURL early-returns when !params). - Add e2e tests via the HTTP adapter for URL object with params and URL object without params (no crash). * feat: note + example added under axios(url[, config]) documenting URL support * feat: url widened to string | URL * feat: oercion now uses config.url instanceof url * chore: add additional test cases to improve coverage * fix: apply suggestions from cubic review --------- Co-authored-by: liuwei53 <liuwei53@baidu.com> Co-authored-by: Jason Saayman <jasonsaayman@gmail.com>
73 lines
1.8 KiB
JavaScript
73 lines
1.8 KiB
JavaScript
'use strict';
|
|
|
|
import utils from '../utils.js';
|
|
import AxiosURLSearchParams from '../helpers/AxiosURLSearchParams.js';
|
|
|
|
/**
|
|
* It replaces URL-encoded forms of `:`, `$`, `,`, and spaces with
|
|
* their plain counterparts (`:`, `$`, `,`, `+`).
|
|
*
|
|
* @param {string} val The value to be encoded.
|
|
*
|
|
* @returns {string} The encoded value.
|
|
*/
|
|
export function encode(val) {
|
|
return encodeURIComponent(val)
|
|
.replace(/%3A/gi, ':')
|
|
.replace(/%24/g, '$')
|
|
.replace(/%2C/gi, ',')
|
|
.replace(/%20/g, '+');
|
|
}
|
|
|
|
/**
|
|
* Build a URL by appending params to the end
|
|
*
|
|
* @param {string} url The base of the url (e.g., http://www.google.com)
|
|
* @param {object} [params] The params to be appended
|
|
* @param {?(object|Function)} options
|
|
*
|
|
* @returns {string} The formatted url
|
|
*/
|
|
export default function buildURL(url, params, options) {
|
|
// Safeguard for direct callers (e.g. via ./unsafe/helpers/buildURL.js): coerce URL-like
|
|
// objects to strings before using string methods below.
|
|
if (url !== null && typeof url === 'object' && typeof url.toString === 'function') {
|
|
url = url.toString();
|
|
}
|
|
|
|
if (!params) {
|
|
return url;
|
|
}
|
|
|
|
const _encode = (options && options.encode) || encode;
|
|
|
|
const _options = utils.isFunction(options)
|
|
? {
|
|
serialize: options,
|
|
}
|
|
: options;
|
|
|
|
const serializeFn = _options && _options.serialize;
|
|
|
|
let serializedParams;
|
|
|
|
if (serializeFn) {
|
|
serializedParams = serializeFn(params, _options);
|
|
} else {
|
|
serializedParams = utils.isURLSearchParams(params)
|
|
? params.toString()
|
|
: new AxiosURLSearchParams(params, _options).toString(_encode);
|
|
}
|
|
|
|
if (serializedParams) {
|
|
const hashmarkIndex = url.indexOf('#');
|
|
|
|
if (hashmarkIndex !== -1) {
|
|
url = url.slice(0, hashmarkIndex);
|
|
}
|
|
url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
|
|
}
|
|
|
|
return url;
|
|
}
|