3.0.23

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartstring",
-  "version": "3.0.19",
+  "version": "3.0.23",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7527,12 +7527,6 @@
       "dev": true,
       "optional": true
     },
-    "nanoid": {
-      "version": "2.1.11",
-      "resolved": "https://verdaccio.lossless.one/nanoid/-/nanoid-2.1.11.tgz",
-      "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==",
-      "dev": true
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://verdaccio.lossless.one/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -9625,6 +9619,14 @@
       "dev": true,
       "requires": {
         "nanoid": "^2.1.0"
+      },
+      "dependencies": {
+        "nanoid": {
+          "version": "2.1.11",
+          "resolved": "https://verdaccio.lossless.one/nanoid/-/nanoid-2.1.11.tgz",
+          "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==",
+          "dev": true
+        }
       }
     },
     "signal-exit": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartstring",
-  "version": "3.0.19",
+  "version": "3.0.23",
   "private": false,
   "description": "handle strings in smart ways. TypeScript ready.",
   "main": "dist_ts/index.js",

test/test.domain.ts

@@ -29,4 +29,9 @@ tap.test('testDomain2 expect be a basic domain', async () => {
   console.log(testDomain2);
 });
 
+tap.test('should parse complex domains', async () => {
+  testDomain2 = new smartstring.Domain('https://sub1.sub2.lossless.com/some/path:5431');
+  console.log(testDomain2);
+});
+
 tap.start();

ts/smartstring.domain.ts

@@ -16,7 +16,12 @@ export class Domain {
   public port;
   public nodeParsedUrl: plugins.url.UrlWithStringQuery;
   constructor(domainStringArg: string) {
-    const regexMatches = this._domainRegex(domainStringArg);
+    // lets do the node standard stuff first
+    this.nodeParsedUrl = plugins.url.parse(domainStringArg);
+    this.port = this.nodeParsedUrl.port;
+
+    // lets do the rest after
+    const regexMatches = this._domainRegex(domainStringArg.replace(this.nodeParsedUrl.path, ''));
     this.fullName = '';
     for (let i = 1; i <= 5; i++) {
       if (regexMatches[i - 1]) {
@@ -38,9 +43,6 @@ export class Domain {
     this.topLevel = this.level1;
     this.domainName = this.level2;
     this.subDomain = this.level3;
-
-    this.nodeParsedUrl = plugins.url.parse(domainStringArg);
-    this.port = this.nodeParsedUrl.port;
   }
 
   // helper functions

ts/smartstring.plugins.ts

@@ -8,9 +8,11 @@ import * as url from 'url';
 export { crypto, url };
 
 // third party
-export let jsBase64 = require('js-base64').Base64;
+const jsBase64 = require('js-base64').Base64;
 
-export let stripIndent = require('strip-indent');
+const stripIndent = require('strip-indent');
-export let normalizeNewline = require('normalize-newline');
+const normalizeNewline = require('normalize-newline');
-export let randomatic = require('randomatic');
+const randomatic = smartenvInstance.getSafeNodeModule('randomatic');
-export let cryptoRandomString = require('crypto-random-string');
+const cryptoRandomString = smartenvInstance.getSafeNodeModule('crypto-random-string');
+
+export { jsBase64, stripIndent, normalizeNewline, randomatic, cryptoRandomString };