Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
b84c8053ff | |||
544f309dc9 | |||
f6e6697244 | |||
ce6622f858 | |||
105b1ca637 | |||
546c7806bc | |||
d446575e60 | |||
31922529ae | |||
fced2e845e | |||
c7169e37a6 | |||
04a62f6176 | |||
ea9b67a328 | |||
dbb62a819a |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smarturl",
|
||||
"version": "1.0.3",
|
||||
"version": "2.0.1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smarturl",
|
||||
"version": "1.0.3",
|
||||
"version": "2.0.1",
|
||||
"private": false,
|
||||
"description": "a url parsing lib",
|
||||
"main": "dist_ts/index.js",
|
||||
|
14
test/test.ts
14
test/test.ts
@ -8,4 +8,18 @@ tap.test('first test', async () => {
|
||||
expect(testSmarturl).to.be.instanceOf(smarturl.Smarturl);
|
||||
});
|
||||
|
||||
tap.test('should parse an URL', async () => {
|
||||
const testUrl = 'https://lossless.com:3000/?some=cool&more=yes';
|
||||
// const urlMod = await import('url');
|
||||
// const altParsed = urlMod.parse(testUrl);
|
||||
// console.log(altParsed);
|
||||
const parsedUrl = smarturl.Smarturl.createFromUrl(testUrl, {
|
||||
searchParams: {
|
||||
more: 'overwritten'
|
||||
}
|
||||
});
|
||||
console.log(parsedUrl);
|
||||
console.log(parsedUrl.toString());
|
||||
});
|
||||
|
||||
tap.start();
|
||||
|
@ -1,7 +1,112 @@
|
||||
import * as plugins from './smarturl.plugins';
|
||||
|
||||
export class Smarturl {
|
||||
public parseUrl(urlArg: string) {
|
||||
return plugins.url.parse(urlArg);
|
||||
export interface IUrlObject {
|
||||
href: string;
|
||||
origin: string;
|
||||
protocol: string;
|
||||
username: string;
|
||||
password: string;
|
||||
host: string;
|
||||
hostname: string;
|
||||
port: string;
|
||||
path: string;
|
||||
pathname: string;
|
||||
search: string;
|
||||
searchParams: ISearchParams;
|
||||
hash: string;
|
||||
}
|
||||
|
||||
export interface ISearchParams {
|
||||
[key: string]: string;
|
||||
}
|
||||
|
||||
export class Smarturl implements IUrlObject {
|
||||
public static createFromUrl(
|
||||
urlArg: string,
|
||||
optionsArg?: {
|
||||
searchParams?: ISearchParams;
|
||||
}
|
||||
): Smarturl {
|
||||
const parsedUrlInstance = new plugins.url.URL(urlArg);
|
||||
const searchParams: ISearchParams = {};
|
||||
|
||||
// enrichment
|
||||
const searchParamKeys = parsedUrlInstance.searchParams.keys();
|
||||
for (const key of searchParamKeys) {
|
||||
searchParams[key] = parsedUrlInstance.searchParams.get(key);
|
||||
}
|
||||
if (optionsArg?.searchParams) {
|
||||
for (const key of Object.keys(optionsArg.searchParams)) {
|
||||
searchParams[key] = optionsArg.searchParams[key];
|
||||
}
|
||||
}
|
||||
|
||||
let path = parsedUrlInstance.pathname;
|
||||
if (Object.keys(searchParams).length > 0) {
|
||||
path += '?';
|
||||
let first = true;
|
||||
for(const key of Object.keys(searchParams)) {
|
||||
if (first) {
|
||||
first = false;
|
||||
} else {
|
||||
path += '&';
|
||||
}
|
||||
path += `${key}=${searchParams[key]}`;
|
||||
}
|
||||
}
|
||||
|
||||
const parsedUrl: IUrlObject = {
|
||||
href: parsedUrlInstance.href,
|
||||
origin: parsedUrlInstance.origin,
|
||||
protocol: parsedUrlInstance.protocol,
|
||||
username: parsedUrlInstance.username,
|
||||
password: parsedUrlInstance.password,
|
||||
host: parsedUrlInstance.host,
|
||||
hostname: parsedUrlInstance.hostname,
|
||||
port: parsedUrlInstance.port,
|
||||
path,
|
||||
pathname: parsedUrlInstance.pathname,
|
||||
search: parsedUrlInstance.search,
|
||||
searchParams,
|
||||
hash: parsedUrlInstance.hash,
|
||||
};
|
||||
|
||||
if (!parsedUrl.port && parsedUrl.protocol === 'https:') {
|
||||
// console.log(`inferring port 443 for "https:"`);
|
||||
parsedUrl.port = '443';
|
||||
}
|
||||
if (!parsedUrl.port && parsedUrl.protocol === 'http:') {
|
||||
// console.log(`inferring port 80 for "http:"`);
|
||||
parsedUrl.port = '80';
|
||||
}
|
||||
const returnSmarturl = new Smarturl();
|
||||
Object.assign(returnSmarturl, parsedUrl);
|
||||
return returnSmarturl;
|
||||
}
|
||||
public static createFromParsedUrl(parsedUrlArg: IUrlObject) {
|
||||
const returnSmarturl = new Smarturl();
|
||||
Object.assign(returnSmarturl, parsedUrlArg);
|
||||
return returnSmarturl;
|
||||
}
|
||||
|
||||
// INSTANCE
|
||||
href: string;
|
||||
origin: string;
|
||||
protocol: string;
|
||||
username: string;
|
||||
password: string;
|
||||
host: string;
|
||||
hostname: string;
|
||||
port: string;
|
||||
path: string;
|
||||
pathname: string;
|
||||
search: string;
|
||||
searchParams: ISearchParams;
|
||||
hash: string;
|
||||
|
||||
constructor() {}
|
||||
|
||||
toString() {
|
||||
return `${this.protocol}//${this.hostname}:${this.port}${this.path}`
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user