3.0.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smarturl",
-  "version": "3.0.1",
+  "version": "3.0.6",
   "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"
-  }
+  ]
 }

test/test.both.ts

@@ -22,4 +22,22 @@ tap.test('should parse an URL', async () => {
   console.log(parsedUrl.toString());
 });
 
+tap.test('should parse an URL', async () => {
+  const testUrl = 'https://lossless.com:3000/';
+  const parsedUrl = smarturl.Smarturl.createFromUrl(testUrl, {
+    searchParams: {
+      more: 'overwritten',
+    },
+  });
+  console.log(parsedUrl);
+  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();

test/test.searchaprams.both.ts

@@ -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();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smarturl',
-  version: '3.0.1',
+  version: '3.0.6',
   description: 'a url parsing lib'
 }

ts/smarturl.classes.smarturl.ts

@@ -27,19 +27,26 @@ export class Smarturl implements IUrlObject {
       searchParams?: ISearchParams;
     }
   ): Smarturl {
-    const parsedUrlInstance = plugins.url(urlArg);
+    const parsedUrlInstance = new URL(urlArg);
     const searchParams: ISearchParams = {};
 
     // enrichment
-    const searchParamPairs = parsedUrlInstance.search
+    const searchParamPairs: {
+      key: string;
+      value: string;
+    }[] = []
+
+    if (parsedUrlInstance.search) {
+      parsedUrlInstance.search
       .replace('?', '')
       .split('&')
       .map((searchParamPair) => {
-        return {
+        searchParamPairs.push({
           key: searchParamPair.split('=')[0],
           value: searchParamPair.split('=')[1],
-        };
+        });
       });
+    }
 
     for (const searchParamPair of searchParamPairs) {
       searchParams[searchParamPair.key] = searchParamPair.value;
@@ -50,7 +57,7 @@ export class Smarturl implements IUrlObject {
       }
     }
 
-    let path = parsedUrlInstance.pathname;
+    let path = parsedUrlInstance.pathname || '';
     if (Object.keys(searchParams).length > 0) {
       path += '?';
       let first = true;
@@ -65,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,
@@ -113,9 +121,20 @@ export class Smarturl implements IUrlObject {
   searchParams: ISearchParams;
   hash: string;
 
-  constructor() {}
+  constructor() {
+    this.searchParams = {};
+  }
 
   toString() {
-    return `${this.protocol}//${this.hostname}:${this.port}${this.path}`;
+    let userpart = ``;
+    if (this.username && !this.password) {
+      userpart = `${this.username}@`;
+    }
+    if (this.username && this.password) {
+      userpart = `${this.username}:${this.password}@`;
+    }
+
+
+    return `${this.protocol}//${userpart}${this.hostname}:${this.port}${this.path}`;
   }
 }

ts/smarturl.plugins.ts

@@ -1,4 +1 @@
-// node native
-import { default as url } from 'parse-url';
-
-export { url };
+export {};