push.rocks/smartstring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2021-01-22 14:46:02 +00:00
parent 9d189d1b59
commit 7f3118c525
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -56,4 +56,4 @@
"browserslist": [ "browserslist": [
"last 1 chrome versions" "last 1 chrome versions"
] ]
} }

5
test/test.domain.ts
View File

@ -29,4 +29,9 @@ tap.test('testDomain2 expect be a basic domain', async () => {
console.log(testDomain2); 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(); tap.start();

10
ts/smartstring.domain.ts
View File

@ -16,7 +16,12 @@ export class Domain {
public port; public port;
public nodeParsedUrl: plugins.url.UrlWithStringQuery; public nodeParsedUrl: plugins.url.UrlWithStringQuery;
constructor(domainStringArg: string) { 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 = ''; this.fullName = '';
for (let i = 1; i <= 5; i++) { for (let i = 1; i <= 5; i++) {
if (regexMatches[i - 1]) { if (regexMatches[i - 1]) {
@ -38,9 +43,6 @@ export class Domain {
this.topLevel = this.level1; this.topLevel = this.level1;
this.domainName = this.level2; this.domainName = this.level2;
this.subDomain = this.level3; this.subDomain = this.level3;
this.nodeParsedUrl = plugins.url.parse(domainStringArg);
this.port = this.nodeParsedUrl.port;
} }
// helper functions // helper functions

8
ts/smartstring.plugins.ts
View File

@ -15,10 +15,4 @@ const normalizeNewline = require('normalize-newline');
const randomatic = smartenvInstance.getSafeNodeModule('randomatic'); const randomatic = smartenvInstance.getSafeNodeModule('randomatic');
const cryptoRandomString = smartenvInstance.getSafeNodeModule('crypto-random-string'); const cryptoRandomString = smartenvInstance.getSafeNodeModule('crypto-random-string');
export { export { jsBase64, stripIndent, normalizeNewline, randomatic, cryptoRandomString };
jsBase64,
stripIndent,
normalizeNewline,
randomatic,
cryptoRandomString
}