4.0.6

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -3,36 +3,44 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
+
+before_script:
+  - npm install -g @shipzone/npmci
 
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-  - npmci git mirror
-  tags:
-  - docker
-  - notpriv
-
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
-  - notpriv
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -41,37 +49,36 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - priv
+    - docker
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -79,36 +86,37 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable 
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -116,5 +124,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -9,11 +9,12 @@
     "dockerSock": false
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartstring",
-      "shortDescription": "handle strings in smart ways. TypeScript ready.",
+      "description": "handle strings in smart ways. TypeScript ready.",
       "npmPackagename": "@pushrocks/smartstring",
       "license": "MIT"
     }

package.json

@@ -1,13 +1,15 @@
 {
   "name": "@pushrocks/smartstring",
-  "version": "3.0.15",
+  "version": "4.0.6",
   "private": false,
   "description": "handle strings in smart ways. TypeScript ready.",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -24,30 +26,39 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartstring#readme",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.12",
-    "tslint": "^5.20.0",
+    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tstest": "^1.0.73",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.7.17",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "crypto-random-string": "^3.0.1",
-    "js-base64": "^2.5.1",
-    "normalize-newline": "^3.0.0",
+    "@pushrocks/isounique": "^1.0.5",
+    "@pushrocks/smartenv": "^5.0.3",
+    "@types/randomatic": "^3.1.3",
+    "buffer": "^6.0.3",
+    "crypto-random-string": "^4.0.0",
+    "js-base64": "^3.7.2",
+    "normalize-newline": "^4.1.0",
     "randomatic": "^3.1.1",
-    "strip-indent": "^3.0.0"
+    "strip-indent": "^4.0.0",
+    "url": "^0.11.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,13 +8,20 @@ handle strings in smart ways. TypeScript ready.
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartstring/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartstring/badges/master/build.svg)](https://gitlab.com/pushrocks/smartstring/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartstring/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartstring/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartstring.svg)](https://www.npmjs.com/package/@pushrocks/smartstring)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartstring/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartstring)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartstring/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartstring/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartstring)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartstring)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartstring)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartstring)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartstring)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -58,6 +65,10 @@ smartstring.indent.indent('somestringanotherstring', '>>>> '); // indents a stri
 smartstring.indent.normalize('    somestring        anotherstring', '>>>> '); // looks for the least amount of indention and removes superflouous space
 ```
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.base64.both.ts

@@ -1,16 +1,23 @@
-import * as smartstring from '../ts/index';
+import * as smartstring from '../ts/index.js';
 import { tap, expect } from '@pushrocks/tapbundle';
 
 // Base64
 let testBase64: smartstring.Base64;
+
 tap.test('expect create a valid instance of Base64', async () => {
   testBase64 = new smartstring.Base64('somestring', 'string');
-  expect(testBase64).be.instanceOf(smartstring.Base64);
+  expect(testBase64).toBeInstanceOf(smartstring.Base64);
 });
+
 tap.test('expect read output a file as base64 and base64uri', async () => {
-  expect(testBase64.base64String).not.equal(testBase64.base64UriString);
+  expect(testBase64.base64String).not.toEqual(testBase64.base64UriString);
   let testBase64_2 = new smartstring.Base64(testBase64.base64UriString, 'base64uri');
-  expect(testBase64_2.simpleString).equal(testBase64.simpleString);
+  expect(testBase64_2.simpleString).toEqual(testBase64.simpleString);
+});
+
+tap.test('should test for a valid base64 token', async () => {
+  const result = smartstring.base64.isBase64('dGVzdA==');
+  expect(result).toBeTrue();
 });
 
 tap.start();

test/test.docker.both.ts

@@ -1,12 +1,12 @@
-import * as smartstring from '../ts/index';
+import * as smartstring from '../ts/index.js';
 import { tap, expect } from '@pushrocks/tapbundle';
 
 // Docker
 tap.test('expect create a Env Object', async () => {
   let envStringArray = ['VIRTUAL_HOST=sub.domain.tld', 'DEFAULT_HOST=some.domain.com'];
   let envObject: any = smartstring.docker.makeEnvObject(envStringArray);
-  expect(envObject.VIRTUAL_HOST).to.equal('sub.domain.tld');
-  expect(envObject.DEFAULT_HOST).to.equal('some.domain.com');
+  expect(envObject.VIRTUAL_HOST).toEqual('sub.domain.tld');
+  expect(envObject.DEFAULT_HOST).toEqual('some.domain.com');
 });
 
 tap.start();

test/test.domain.both.ts

@@ -1,4 +1,4 @@
-import * as smartstring from '../ts/index';
+import * as smartstring from '../ts/index.js';
 import { tap, expect } from '@pushrocks/tapbundle';
 
 // Domain
@@ -6,26 +6,31 @@ let testDomain: smartstring.Domain;
 let testDomain2: smartstring.Domain;
 tap.test('expect create a new Domain object', async () => {
   testDomain = new smartstring.Domain('https://level3D.level2D.level1D');
-  expect(testDomain).be.instanceof(smartstring.Domain);
+  expect(testDomain).toBeInstanceOf(smartstring.Domain);
   console.log(testDomain);
 });
 tap.test('expect have a .topLevel', async () => {
-  expect(testDomain.topLevel).equal('level1D');
+  expect(testDomain.topLevel).toEqual('level1D');
 });
 tap.test('expect have a .level2', async () => {
-  expect(testDomain.level2).equal('level2D');
+  expect(testDomain.level2).toEqual('level2D');
 });
 tap.test('expect have a .level3', async () => {
-  expect(testDomain.level3).equal('level3D');
+  expect(testDomain.level3).toEqual('level3D');
 });
 tap.test('expect have the correct dns zone name', async () => {
-  expect(testDomain.zoneName).equal('level2D.level1D');
+  expect(testDomain.zoneName).toEqual('level2D.level1D');
 });
 tap.test('expect have the correct protocol', async () => {
-  expect(testDomain.protocol).equal('https');
+  expect(testDomain.protocol).toEqual('https');
 });
 tap.test('testDomain2 expect be a basic domain', async () => {
-  testDomain2 = new smartstring.Domain('bleu.de');
+  testDomain2 = new smartstring.Domain('testing.bleu.de');
+  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);
 });
 

test/test.git.both.ts

@@ -1,26 +1,26 @@
-import * as smartstring from '../ts/index';
+import * as smartstring from '../ts/index.js';
 import { tap, expect } from '@pushrocks/tapbundle';
 
 // git
 let testGit: smartstring.GitRepo;
 tap.test('expect create a new Git class GitRepo', async () => {
   testGit = new smartstring.GitRepo('git+https://github.com/pushrocks/smartstring.git');
-  expect(testGit).be.instanceof(smartstring.GitRepo);
+  expect(testGit).toBeInstanceOf(smartstring.GitRepo);
 });
 tap.test('expect return a .host', async () => {
-  expect(testGit.host).equal('github.com');
+  expect(testGit.host).toEqual('github.com');
 });
 tap.test('expect return a .user', async () => {
-  expect(testGit.user).equal('pushrocks');
+  expect(testGit.user).toEqual('pushrocks');
 });
 tap.test('expect return a .repo', async () => {
-  expect(testGit.repo).equal('smartstring');
+  expect(testGit.repo).toEqual('smartstring');
 });
 tap.test('expect return a .httpsUrl', async () => {
-  expect(testGit.httpsUrl).equal('https://github.com/pushrocks/smartstring.git');
+  expect(testGit.httpsUrl).toEqual('https://github.com/pushrocks/smartstring.git');
 });
 tap.test('expect return a .sshUrl', async () => {
-  expect(testGit.sshUrl).equal('git@github.com:pushrocks/smartstring.git');
+  expect(testGit.sshUrl).toEqual('git@github.com:pushrocks/smartstring.git');
 });
 
 tap.start();

test/test.indent.both.ts

@@ -1,4 +1,4 @@
-import * as smartstring from '../ts/index';
+import * as smartstring from '../ts/index.js';
 import { tap, expect } from '@pushrocks/tapbundle';
 
 // indent

test/test.normalize.both.ts

@@ -1,6 +1,6 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 
-import * as smartstring from '../ts/index';
+import * as smartstring from '../ts/index.js';
 
 tap.test('should normalize a string', async () => {
   const testString = `
@@ -8,7 +8,7 @@ tap.test('should normalize a string', async () => {
       is indented with two spaces
   `;
   const normalizedString = smartstring.normalize.standard(testString);
-  expect(normalizedString).to.equal(
+  expect(normalizedString).toEqual(
     `
 myawesome string;
   is indented with two spaces

test/test.type.both.ts

@@ -1,14 +1,14 @@
 import { tap, expect } from '@pushrocks/tapbundle';
-import * as smartstring from '../ts';
+import * as smartstring from '../ts/index.js';
 
 tap.test('should state valuid utf8', async () => {
-  expect(smartstring.type.isUtf8('hithere')).to.be.true;
+  expect(smartstring.type.isUtf8('hithere')).toBeTrue();
 });
 
 tap.test('should state wether base64 string is valid', async () => {
   const base64String = smartstring.base64.encode('hi there');
-  expect(smartstring.type.isBase64(base64String)).to.be.true;
-  expect(smartstring.type.isBase64('hi there')).to.be.false;
+  expect(smartstring.type.isBase64(base64String)).toBeTrue();
+  expect(smartstring.type.isBase64('hi there')).toBeFalse();
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartstring',
+  version: '4.0.6',
+  description: 'handle strings in smart ways. TypeScript ready.'
+}

ts/index.ts

@@ -1,13 +1,11 @@
-import * as create from './smartstring.create';
-import * as docker from './smartstring.docker';
-import * as indent from './smartstring.indent';
-import * as normalize from './smartstring.normalize';
-import * as type from './smartstring.type';
+import * as create from './smartstring.create.js';
+import * as docker from './smartstring.docker.js';
+import * as indent from './smartstring.indent.js';
+import * as normalize from './smartstring.normalize.js';
+import * as type from './smartstring.type.js';
 
 export { create, docker, normalize, indent, type };
 
-export { Base64, base64 } from './smartstring.base64';
-export { Domain } from './smartstring.domain';
-export { GitRepo } from './smartstring.git';
-
-export { Cryptr } from './smartstring.encryption';
+export { Base64, base64 } from './smartstring.base64.js';
+export { Domain } from './smartstring.domain.js';
+export { GitRepo } from './smartstring.git.js';

ts/smartstring.base64.ts

@@ -1,16 +1,16 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 /**
  * the type for base 64
  */
-export type TBase64Input = 'string' | 'base64' | 'base64uri';
+export type TStringInputType = 'string' | 'base64' | 'base64uri';
 
 /**
  * handle base64 strings
  */
 export class Base64 {
   private refString: string;
-  constructor(inputStringArg, typeArg: TBase64Input) {
+  constructor(inputStringArg, typeArg: TStringInputType) {
     switch (typeArg) {
       case 'string': // easiest case
         this.refString = inputStringArg;
@@ -65,5 +65,15 @@ export let base64 = {
    */
   decode: (stringArg: string) => {
     return plugins.jsBase64.decode(stringArg);
-  }
+  },
+
+  /**
+   *
+   * @param stringArg
+   * checks wether the string is base64 encoded
+   */
+  isBase64: (stringArg: string) => {
+    const regex = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
+    return regex.test(stringArg);
+  },
 };

ts/smartstring.create.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 /**
  * creates a random string
@@ -24,6 +24,6 @@ export const createRandomString = (
  * creates a crytic string in the speicifed length
  * @param lengthArg the length of the crypto string
  */
-export const createCryptoRandomString = (lengthArg: number): string => {
-  return plugins.cryptoRandomString(lengthArg);
+export const createCryptoRandomString = (): string => {
+  return plugins.isounique.uni();
 };

ts/smartstring.docker.ts

@@ -1,11 +1,11 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 /**
  * converts an erray of env strings from docker remote api to an usable object.
  * @param envArrayArg
  * @returns {}
  */
-export const makeEnvObject = function(envArrayArg: string[]) {
+export const makeEnvObject = function (envArrayArg: string[]) {
   let returnObject = {};
   let regexString = /(.*)=(.*)/;
   if (typeof envArrayArg !== 'undefined') {

ts/smartstring.domain.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 export class Domain {
   public fullName: string;
@@ -16,7 +16,18 @@ 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.protocol = this._protocolRegex(domainStringArg);
+    if (!this.protocol) {
+      domainStringArg = `https://${domainStringArg}`;
+    }
+    this.nodeParsedUrl = plugins.url.parse(domainStringArg);
+    this.port = this.nodeParsedUrl.port;
+
+    // lets do the rest after
+    const regexMatches = this._domainRegex(
+      domainStringArg.replace(this.nodeParsedUrl.pathname, '')
+    );
     this.fullName = '';
     for (let i = 1; i <= 5; i++) {
       if (regexMatches[i - 1]) {
@@ -31,27 +42,24 @@ export class Domain {
         this['level' + i.toString()] = undefined;
       }
     }
-    this.protocol = this._protocolRegex(domainStringArg);
     this.zoneName = this.level2 + '.' + this.level1;
 
     // aliases
     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
 
   /** */
   private _domainRegex(stringArg: string) {
-    const regexString = /([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}$/;
+    const regexString =
+      /([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}$/;
     const regexMatches = regexString.exec(stringArg);
     regexMatches.reverse(); //make sure we build the domain from toplevel to subdomain (reversed order)
     regexMatches.pop(); // pop the last element, which is, since we reversed the Array, the full String of matched elements
-    const regexMatchesFiltered = regexMatches.filter(function(stringArg: string) {
+    const regexMatchesFiltered = regexMatches.filter(function (stringArg: string) {
       return stringArg !== '';
     });
     return regexMatchesFiltered;

ts/smartstring.encryption.ts

@@ -1,43 +0,0 @@
-import * as plugins from './smartstring.plugins';
-
-const algorithm = 'aes-256-ctr';
-
-export class Cryptr {
-  private key: Buffer;
-
-  constructor(secret) {
-    if (!secret || typeof secret !== 'string') {
-      throw new Error('Cryptr: secret must be a non-0-length string');
-    }
-
-    this.key = plugins.crypto
-      .createHash('sha256')
-      .update(String(secret))
-      .digest();
-  }
-
-  encrypt(value: string) {
-    if (value == null) {
-      throw new Error('value must not be null or undefined');
-    }
-
-    const iv = plugins.crypto.randomBytes(16);
-    const cipher = plugins.crypto.createCipheriv(algorithm, this.key, iv);
-    const encrypted = cipher.update(String(value), 'utf8', 'hex') + cipher.final('hex');
-
-    return iv.toString('hex') + encrypted;
-  }
-
-  decrypt(value: string) {
-    if (value == null) {
-      throw new Error('value must not be null or undefined');
-    }
-
-    const stringValue = String(value);
-    const iv = Buffer.from(stringValue.slice(0, 32), 'hex');
-    const encrypted = stringValue.slice(32);
-
-    const decipher = plugins.crypto.createDecipheriv(algorithm, this.key, iv);
-    return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8');
-  }
-}

ts/smartstring.git.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 /* ---------------------------------------------- *
  * ------------------ classes ------------------- *
@@ -24,13 +24,14 @@ export class GitRepo {
 /* ---------------------------------------------- *
  * ------------------ helpers ------------------- *
  * ---------------------------------------------- */
-const gitRegex = function(stringArg: string) {
-  const regexString = /([a-zA-Z0-9\-\.]*)(?:\/|\:)([a-zA-Z0-9\-\.]*)(?:\/)([a-zA-Z0-9\-\.]*)(?:\.git)/;
+const gitRegex = function (stringArg: string) {
+  const regexString =
+    /([a-zA-Z0-9\-_\.]*)(?:\/|\:)([a-zA-Z0-9\-_\.]*)(?:\/)([a-zA-Z0-9\-_\.]*)(?:\.git)/;
   let regexMatches = regexString.exec(stringArg);
   return regexMatches;
 };
 
-const gitLink = function(
+const gitLink = function (
   hostArg: string,
   userArg: string,
   repoArg: string,

ts/smartstring.indent.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 /**
  * splits a string into an array

ts/smartstring.normalize.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartstring.plugins';
+import * as plugins from './smartstring.plugins.js';
 
 /**
  * replaces all occurences of something in a string

ts/smartstring.plugins.ts

@@ -1,13 +1,22 @@
 // node native
-import crypto from 'crypto';
-import * as url from 'url';
+import * as smartenv from '@pushrocks/smartenv';
+const smartenvInstance = new smartenv.Smartenv();
+import * as isounique from '@pushrocks/isounique';
 
-export { crypto, url };
+export { isounique };
+
+import { Buffer } from 'buffer';
+if (smartenvInstance.isBrowser) {
+  globalThis.Buffer = Buffer;
+}
+import * as url from 'url';
+export { url };
 
 // third party
-export let jsBase64 = require('js-base64').Base64;
+import { Base64 as jsBase64 } from 'js-base64';
 
-export let stripIndent = require('strip-indent');
-export let normalizeNewline = require('normalize-newline');
-export let randomatic = require('randomatic');
-export let cryptoRandomString = require('crypto-random-string');
+import stripIndent from 'strip-indent';
+import normalizeNewline from 'normalize-newline';
+import randomatic from 'randomatic';
+
+export { jsBase64, stripIndent, normalizeNewline, randomatic };

ts/smartstring.type.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartstring.plugins';
-import * as base64 from './smartstring.base64';
+import * as plugins from './smartstring.plugins.js';
+import * as base64 from './smartstring.base64.js';
 
 export const isUtf8 = (stringArg: string) => {
   const bytes = Buffer.from(stringArg);
@@ -20,7 +20,8 @@ export const isUtf8 = (stringArg: string) => {
       // non-overlong 2-byte
       0xc2 <= bytes[i] &&
       bytes[i] <= 0xdf &&
-      (0x80 <= bytes[i + 1] && bytes[i + 1] <= 0xbf)
+      0x80 <= bytes[i + 1] &&
+      bytes[i + 1] <= 0xbf
     ) {
       i += 2;
       continue;
@@ -29,14 +30,20 @@ export const isUtf8 = (stringArg: string) => {
     if (
       // excluding overlongs
       (bytes[i] === 0xe0 &&
-        (0xa0 <= bytes[i + 1] && bytes[i + 1] <= 0xbf) &&
-        (0x80 <= bytes[i + 2] && bytes[i + 2] <= 0xbf)) || // straight 3-byte
+        0xa0 <= bytes[i + 1] &&
+        bytes[i + 1] <= 0xbf &&
+        0x80 <= bytes[i + 2] &&
+        bytes[i + 2] <= 0xbf) || // straight 3-byte
       (((0xe1 <= bytes[i] && bytes[i] <= 0xec) || bytes[i] === 0xee || bytes[i] === 0xef) &&
-        (0x80 <= bytes[i + 1] && bytes[i + 1] <= 0xbf) &&
-        (0x80 <= bytes[i + 2] && bytes[i + 2] <= 0xbf)) || // excluding surrogates
+        0x80 <= bytes[i + 1] &&
+        bytes[i + 1] <= 0xbf &&
+        0x80 <= bytes[i + 2] &&
+        bytes[i + 2] <= 0xbf) || // excluding surrogates
       (bytes[i] === 0xed &&
-        (0x80 <= bytes[i + 1] && bytes[i + 1] <= 0x9f) &&
-        (0x80 <= bytes[i + 2] && bytes[i + 2] <= 0xbf))
+        0x80 <= bytes[i + 1] &&
+        bytes[i + 1] <= 0x9f &&
+        0x80 <= bytes[i + 2] &&
+        bytes[i + 2] <= 0xbf)
     ) {
       i += 3;
       continue;
@@ -45,18 +52,27 @@ export const isUtf8 = (stringArg: string) => {
     if (
       // planes 1-3
       (bytes[i] === 0xf0 &&
-        (0x90 <= bytes[i + 1] && bytes[i + 1] <= 0xbf) &&
-        (0x80 <= bytes[i + 2] && bytes[i + 2] <= 0xbf) &&
-        (0x80 <= bytes[i + 3] && bytes[i + 3] <= 0xbf)) || // planes 4-15
+        0x90 <= bytes[i + 1] &&
+        bytes[i + 1] <= 0xbf &&
+        0x80 <= bytes[i + 2] &&
+        bytes[i + 2] <= 0xbf &&
+        0x80 <= bytes[i + 3] &&
+        bytes[i + 3] <= 0xbf) || // planes 4-15
       (0xf1 <= bytes[i] &&
         bytes[i] <= 0xf3 &&
-        (0x80 <= bytes[i + 1] && bytes[i + 1] <= 0xbf) &&
-        (0x80 <= bytes[i + 2] && bytes[i + 2] <= 0xbf) &&
-        (0x80 <= bytes[i + 3] && bytes[i + 3] <= 0xbf)) || // plane 16
+        0x80 <= bytes[i + 1] &&
+        bytes[i + 1] <= 0xbf &&
+        0x80 <= bytes[i + 2] &&
+        bytes[i + 2] <= 0xbf &&
+        0x80 <= bytes[i + 3] &&
+        bytes[i + 3] <= 0xbf) || // plane 16
       (bytes[i] === 0xf4 &&
-        (0x80 <= bytes[i + 1] && bytes[i + 1] <= 0x8f) &&
-        (0x80 <= bytes[i + 2] && bytes[i + 2] <= 0xbf) &&
-        (0x80 <= bytes[i + 3] && bytes[i + 3] <= 0xbf))
+        0x80 <= bytes[i + 1] &&
+        bytes[i + 1] <= 0x8f &&
+        0x80 <= bytes[i + 2] &&
+        bytes[i + 2] <= 0xbf &&
+        0x80 <= bytes[i + 3] &&
+        bytes[i + 3] <= 0xbf)
     ) {
       i += 4;
       continue;
@@ -75,7 +91,9 @@ export const isBase64 = (stringArg: string) => {
     return false;
   }
   const firstPaddingChar = stringArg.indexOf('=');
-  return firstPaddingChar === -1 ||
+  return (
+    firstPaddingChar === -1 ||
     firstPaddingChar === len - 1 ||
-    (firstPaddingChar === len - 2 && stringArg[len - 1] === '=');
+    (firstPaddingChar === len - 2 && stringArg[len - 1] === '=')
+  );
 };

tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}