fix(core): update
This commit is contained in:
@@ -27,13 +27,22 @@ export class Smarturl implements IUrlObject {
|
||||
searchParams?: ISearchParams;
|
||||
}
|
||||
): Smarturl {
|
||||
const parsedUrlInstance = new plugins.url.URL(urlArg);
|
||||
const parsedUrlInstance = plugins.url(urlArg);
|
||||
const searchParams: ISearchParams = {};
|
||||
|
||||
// enrichment
|
||||
const searchParamKeys = parsedUrlInstance.searchParams.keys();
|
||||
for (const key of searchParamKeys) {
|
||||
searchParams[key] = parsedUrlInstance.searchParams.get(key);
|
||||
const searchParamPairs = parsedUrlInstance.search
|
||||
.replace('?', '')
|
||||
.split('&')
|
||||
.map((searchParamPair) => {
|
||||
return {
|
||||
key: searchParamPair.split('=')[0],
|
||||
value: searchParamPair.split('=')[1],
|
||||
};
|
||||
});
|
||||
|
||||
for (const searchParamPair of searchParamPairs) {
|
||||
searchParams[searchParamPair.key] = searchParamPair.value;
|
||||
}
|
||||
if (optionsArg?.searchParams) {
|
||||
for (const key of Object.keys(optionsArg.searchParams)) {
|
||||
@@ -57,12 +66,12 @@ export class Smarturl implements IUrlObject {
|
||||
|
||||
const parsedUrl: IUrlObject = {
|
||||
href: parsedUrlInstance.href,
|
||||
origin: parsedUrlInstance.origin,
|
||||
origin: `${parsedUrlInstance.protocol}://${parsedUrlInstance.resource}`,
|
||||
protocol: parsedUrlInstance.protocol,
|
||||
username: parsedUrlInstance.username,
|
||||
password: parsedUrlInstance.password,
|
||||
host: parsedUrlInstance.host,
|
||||
hostname: parsedUrlInstance.hostname,
|
||||
username: parsedUrlInstance.user.split(':')[0],
|
||||
password: parsedUrlInstance.user.split(':')[1] || '',
|
||||
host: `${parsedUrlInstance.resource}:${parsedUrlInstance.port}`,
|
||||
hostname: parsedUrlInstance.resource,
|
||||
port: parsedUrlInstance.port,
|
||||
path,
|
||||
pathname: parsedUrlInstance.pathname,
|
||||
|
||||
Reference in New Issue
Block a user