Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
a8495baf4c | |||
3a29679e66 | |||
08d5627e7e | |||
25a8b750d8 | |||
5eaa7ea0c3 | |||
d255c598b4 | |||
5bb01a2db9 | |||
44b1e67302 | |||
b1162191c6 | |||
60f1368071 |
@ -3,10 +3,10 @@
|
||||
"projectType": "npm",
|
||||
"module": {
|
||||
"githost": "gitlab.com",
|
||||
"gitscope": "pushrocks",
|
||||
"gitscope": "push.rocks",
|
||||
"gitrepo": "smarturl",
|
||||
"description": "a url parsing lib",
|
||||
"npmPackagename": "@pushrocks/smarturl",
|
||||
"npmPackagename": "@push.rocks/smarturl",
|
||||
"license": "MIT",
|
||||
"projectDomain": "push.rocks"
|
||||
}
|
||||
|
14745
package-lock.json
generated
14745
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
16
package.json
16
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smarturl",
|
||||
"version": "3.0.2",
|
||||
"name": "@push.rocks/smarturl",
|
||||
"version": "3.0.7",
|
||||
"private": false,
|
||||
"description": "a url parsing lib",
|
||||
"main": "dist_ts/index.js",
|
||||
@ -14,10 +14,11 @@
|
||||
"buildDocs": "tsdoc"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.63",
|
||||
"@gitzone/tstest": "^1.0.72",
|
||||
"@gitzone/tsbuild": "^2.1.65",
|
||||
"@gitzone/tsrun": "^1.2.39",
|
||||
"@gitzone/tstest": "^1.0.74",
|
||||
"@pushrocks/tapbundle": "^5.0.4",
|
||||
"@types/node": "^18.6.1"
|
||||
"@types/node": "^18.15.11"
|
||||
},
|
||||
"files": [
|
||||
"ts/**/*",
|
||||
@ -33,8 +34,5 @@
|
||||
],
|
||||
"browserslist": [
|
||||
"last 1 chrome versions"
|
||||
],
|
||||
"dependencies": {
|
||||
"parse-url": "^6.0.5"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
4457
pnpm-lock.yaml
generated
Normal file
4457
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -24,9 +24,6 @@ tap.test('should parse an URL', async () => {
|
||||
|
||||
tap.test('should parse an URL', async () => {
|
||||
const testUrl = 'https://lossless.com:3000/';
|
||||
// const urlMod = await import('url');
|
||||
// const altParsed = urlMod.parse(testUrl);
|
||||
// console.log(altParsed);
|
||||
const parsedUrl = smarturl.Smarturl.createFromUrl(testUrl, {
|
||||
searchParams: {
|
||||
more: 'overwritten',
|
||||
@ -36,4 +33,11 @@ tap.test('should parse an URL', async () => {
|
||||
console.log(parsedUrl.toString());
|
||||
});
|
||||
|
||||
tap.test('should correctly parse ans assemble urls', async () => {
|
||||
const testUrl = 'https://lossless.com/';
|
||||
const parsedUrl = smarturl.Smarturl.createFromUrl(testUrl, {});
|
||||
console.log(parsedUrl.toString());
|
||||
expect(parsedUrl.toString()).toEqual('https://lossless.com:443/');
|
||||
});
|
||||
|
||||
tap.start();
|
17
test/test.searchaprams.both.ts
Normal file
17
test/test.searchaprams.both.ts
Normal file
@ -0,0 +1,17 @@
|
||||
import { expect, tap } from '@pushrocks/tapbundle';
|
||||
import * as smarturl from '../ts/index.js';
|
||||
|
||||
let testSmarturl: smarturl.Smarturl;
|
||||
|
||||
tap.test('first test', async () => {
|
||||
testSmarturl = new smarturl.Smarturl();
|
||||
expect(testSmarturl).toBeInstanceOf(smarturl.Smarturl);
|
||||
});
|
||||
|
||||
tap.test('should create searchParams only', async () => {
|
||||
const smarturlInstance = new smarturl.Smarturl();
|
||||
smarturlInstance.searchParams['hello'] = 'hi_there';
|
||||
console.log(smarturlInstance.toString());
|
||||
})
|
||||
|
||||
tap.start();
|
@ -2,7 +2,7 @@
|
||||
* autocreated commitinfo by @pushrocks/commitinfo
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@pushrocks/smarturl',
|
||||
version: '3.0.2',
|
||||
name: '@push.rocks/smarturl',
|
||||
version: '3.0.7',
|
||||
description: 'a url parsing lib'
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ export class Smarturl implements IUrlObject {
|
||||
searchParams?: ISearchParams;
|
||||
}
|
||||
): Smarturl {
|
||||
const parsedUrlInstance = plugins.url(urlArg);
|
||||
const parsedUrlInstance = new URL(urlArg);
|
||||
const searchParams: ISearchParams = {};
|
||||
|
||||
// enrichment
|
||||
@ -72,13 +72,14 @@ export class Smarturl implements IUrlObject {
|
||||
}
|
||||
|
||||
const parsedUrl: IUrlObject = {
|
||||
...parsedUrlInstance,
|
||||
href: parsedUrlInstance.href,
|
||||
origin: `${parsedUrlInstance.protocol}://${parsedUrlInstance.resource}`,
|
||||
origin: parsedUrlInstance.origin,
|
||||
protocol: parsedUrlInstance.protocol,
|
||||
username: parsedUrlInstance.user.split(':')[0],
|
||||
password: parsedUrlInstance.user.split(':')[1] || '',
|
||||
host: `${parsedUrlInstance.resource}:${parsedUrlInstance.port}`,
|
||||
hostname: parsedUrlInstance.resource,
|
||||
username: parsedUrlInstance.username,
|
||||
password: parsedUrlInstance.password,
|
||||
host: parsedUrlInstance.host,
|
||||
hostname: parsedUrlInstance.hostname,
|
||||
port: parsedUrlInstance.port,
|
||||
path,
|
||||
pathname: parsedUrlInstance.pathname,
|
||||
@ -120,7 +121,9 @@ export class Smarturl implements IUrlObject {
|
||||
searchParams: ISearchParams;
|
||||
hash: string;
|
||||
|
||||
constructor() {}
|
||||
constructor() {
|
||||
this.searchParams = {};
|
||||
}
|
||||
|
||||
toString() {
|
||||
let userpart = ``;
|
||||
@ -132,6 +135,6 @@ export class Smarturl implements IUrlObject {
|
||||
}
|
||||
|
||||
|
||||
return `${this.protocol}://${userpart}${this.hostname}:${this.port}/${this.path}`;
|
||||
return `${this.protocol}//${userpart}${this.hostname}:${this.port}${this.path}`;
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1 @@
|
||||
// node native
|
||||
import { default as url } from 'parse-url';
|
||||
|
||||
export { url };
|
||||
export {};
|
Reference in New Issue
Block a user