3.0.22

.gitignore

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

.gitlab-ci.yml

@@ -19,22 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - 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
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+ignore: {}
+patch: {}

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.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,6 +9,7 @@
     "dockerSock": false
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pushrocks/smartstring",
-  "version": "3.0.16",
+  "version": "3.0.22",
   "private": false,
   "description": "handle strings in smart ways. TypeScript ready.",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -24,30 +24,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartstring#readme",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^12.7.12",
+    "@types/node": "^14.14.17",
-    "tslint": "^5.20.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "crypto-random-string": "^3.0.1",
+    "@pushrocks/smartenv": "^4.0.16",
+    "crypto-random-string": "^3.3.0",
     "js-base64": "^2.5.1",
     "normalize-newline": "^3.0.0",
     "randomatic": "^3.1.1",
-    "strip-indent": "^3.0.0"
+    "strip-indent": "^3.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

@@ -0,0 +1,77 @@
+# @pushrocks/smartstring
+handle strings in smart ways. TypeScript ready.
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartstring)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartstring)
+* [github.com (source mirror)](https://github.com/pushrocks/smartstring)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartstring/)
+
+## Status for master
+
+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
+
+Use TypeScript for best in class instellisense.
+
+```javascript
+import * as smartstring from 'smartstring';
+
+// classes
+
+// smartstring.Domain class
+let myDomain = new smartstring.Domain('https://sub.main.tld');
+myDomain.level1; // "tld"
+myDomain.level2; // "main"
+// level3 , level 4 and so on...
+myDomain.zoneName; // "main.tld"
+myDOmain.protocol; // "https"
+
+// smartstring.GitRepo class
+let myGitRepo = new smartstring.GitRepo('git@github.com:someorg/somerepo.git'); // takes https and git and npm repo URL versions
+myGitRepo.host; // "github.com"
+myGitRepo.user; // "someorg"
+myGitRepo.repo; // "somerepo"
+myGitRepo.accessToken; // accessToken if specified with https
+myGitRepo.sshUrl; // "git@github.com:someorg/somerepo.git" (computed also from https)
+myGitRepo.httpsUrl; // "https://github.com/someorg/somerepo.git" (computed also from ssh)
+
+//smartstring.Base64
+let myBase64 = new smartstring.Base64('somestring', 'string'); // first arg is the string, second is string type (can be string, base64, base64uri)
+myBase64.simpleString; // 'somestring'
+myBase64.base64String; // base64 representation of 'somestring'
+myBase64.base64UriString; // base64uri representation of 'sometring'
+
+// methods
+smartstring.base64.encode('somestring'); // encodes 'somestring' to base64
+smartstring.base64.encodeUri('sometring'); // encodes 'somestring' to base64uri
+smartstring.base64.decode(); // decodes base64 and base64uri to simple string respresentation
+
+smartstring.indent.indent('somestringanotherstring', 4); // indents a string by 4
+smartstring.indent.indent('somestringanotherstring', '>>>> '); // indents a string with a prefix
+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)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/smartstring.base64.ts

@@ -65,5 +65,5 @@ export let base64 = {
    */
   decode: (stringArg: string) => {
     return plugins.jsBase64.decode(stringArg);
-  }
+  },
 };

ts/smartstring.docker.ts

@@ -5,7 +5,7 @@ import * as plugins from './smartstring.plugins';
  * @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

@@ -51,7 +51,7 @@ export class Domain {
     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

@@ -10,10 +10,7 @@ export class Cryptr {
       throw new Error('Cryptr: secret must be a non-0-length string');
     }
 
-    this.key = plugins.crypto
+    this.key = plugins.crypto.createHash('sha256').update(String(secret)).digest();
-      .createHash('sha256')
-      .update(String(secret))
-      .digest();
   }
 
   encrypt(value: string) {

ts/smartstring.git.ts

@@ -24,13 +24,13 @@ export class GitRepo {
 /* ---------------------------------------------- *
  * ------------------ helpers ------------------- *
  * ---------------------------------------------- */
-const gitRegex = function(stringArg: string) {
+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.plugins.ts

@@ -1,13 +1,24 @@
 // node native
-import crypto from 'crypto';
+import * as smartenv from '@pushrocks/smartenv';
+const smartenvInstance = new smartenv.Smartenv();
+const crypto = smartenvInstance.getSafeNodeModule('crypto');
+
 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
+}