3.0.0

BREAKING CHANGE(scope): change scope to @pushrocks
2.0.28
2018-07-21 14:37:39 +02:00 · 2018-07-21 14:37:39 +02:00 · 2017-10-26 15:24:13 +02:00 · 2017-10-26 15:24:10 +02:00 · 2017-10-11 15:18:30 +02:00 · 2017-10-11 15:18:26 +02:00
41 changed files with 1602 additions and 543 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,4 @@
-.idea/
-coverage/
-docs/
-node_modules
-ts/**/*.js
-ts/**/*.js.map
-ts/typings/
+.yarn/
+pages/
+public/
+node_modules/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,35 +1,142 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"

 stages:
+- security
 - test
 - release
+- metadata

+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+  - npmci git mirror
+  tags:
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# test stage
+# ====================
 testLEGACY:
  stage: test
  script:
-    - npmci test legacy
+  - npmci node install legacy
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - docker
+  - docker
+  - notpriv
+  allow_failure: true

 testLTS:
  stage: test
  script:
-    - npmci test lts
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - docker
+  - docker
+  - notpriv
    
 testSTABLE:
  stage: test
  script:
-    - npmci test stable
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - docker
+  - docker
+  - notpriv

 release:
  stage: release
  script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
+
+trigger:
+  stage: metadata
+  script:
+  - npmci trigger
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: metadata
+  script:
+    - npmci command npm install -g typedoc typescript
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+  tags:
+    - docker
+    - notpriv
  only:
    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true
+
+windowsCompatibility:
+  image: stefanscherer/node-windows:10-build-tools
+  stage: metadata
+  script:
+  - npm install & npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - docker
+  - windows
+  allow_failure: true
--- a/README.md
+++ b/README.md
@ -1,39 +1,70 @@
 # smartstring
+
 handle strings in smart ways. TypeScript ready.

-## Status
-[![Build Status](https://travis-ci.org/pushrocks/smartstring.svg?branch=master)](https://travis-ci.org/pushrocks/smartstring)
-[![Build status](https://ci.appveyor.com/api/projects/status/x4oe2xxwwcbxmk1h/branch/master?svg=true)](https://ci.appveyor.com/project/philkunz/smartstring/branch/master)
+## Availabililty
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartstring)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartstring)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartstring)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](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/smartstring.svg)](https://www.npmjs.com/package/smartstring)
 [![Dependency Status](https://david-dm.org/pushrocks/smartstring.svg)](https://david-dm.org/pushrocks/smartstring)
 [![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartstring/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartstring/master/dependencies/npm)
 [![bitHound Code](https://www.bithound.io/github/pushrocks/smartstring/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartstring)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)

 ## Usage
-Use TypeScript for intellisense.

-```typescript
-import * as smartstring from "smartstring";
+Use TypeScript for best in class instellisense.

-// 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)
+```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"
+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"
+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
 ```

-## About the authors:
-[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
+For further information read the linked docs at the top of this README.

-[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,10 +0,0 @@
-environment:
-  nodejs_version: "4"
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - npm install
-test_script:
-  - node --version
-  - npm --version
-  - npm test
-build: off
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@ -1,7 +0,0 @@
-import "typings-global";
-import SmartstringDocker = require("./smartstring.docker");
-import SmartstringTypescript = require("./smartstring.typescript");
-export { Domain } from "./smartstring.domain";
-export { GitRepo } from "./smartstring.git";
-export declare let docker: typeof SmartstringDocker;
-export declare let typescript: typeof SmartstringTypescript;
--- a/dist/index.js
+++ b/dist/index.js
@ -1,12 +0,0 @@
-"use strict";
-require("typings-global");
-var SmartstringDocker = require("./smartstring.docker");
-var SmartstringTypescript = require("./smartstring.typescript");
-var smartstring_domain_1 = require("./smartstring.domain");
-exports.Domain = smartstring_domain_1.Domain;
-var smartstring_git_1 = require("./smartstring.git");
-exports.GitRepo = smartstring_git_1.GitRepo;
-exports.docker = SmartstringDocker;
-exports.typescript = SmartstringTypescript;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUNQLENBQUMsQ0FEc0I7QUFDdkIsSUFBTyxpQkFBaUIsV0FBVyxzQkFBc0IsQ0FBQyxDQUFDO0FBQzNELElBQU8scUJBQXFCLFdBQVcsMEJBQTBCLENBQUMsQ0FBQztBQUVuRSxtQ0FBcUIsc0JBQXNCLENBQUM7QUFBcEMsNkNBQW9DO0FBQzVDLGdDQUFzQixtQkFBbUIsQ0FBQztBQUFsQyw0Q0FBa0M7QUFDL0IsY0FBTSxHQUFHLGlCQUFpQixDQUFDO0FBQzNCLGtCQUFVLEdBQUcscUJBQXFCLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXG5pbXBvcnQgU21hcnRzdHJpbmdEb2NrZXIgPSByZXF1aXJlKFwiLi9zbWFydHN0cmluZy5kb2NrZXJcIik7XG5pbXBvcnQgU21hcnRzdHJpbmdUeXBlc2NyaXB0ID0gcmVxdWlyZShcIi4vc21hcnRzdHJpbmcudHlwZXNjcmlwdFwiKTtcblxuZXhwb3J0IHtEb21haW59IGZyb20gXCIuL3NtYXJ0c3RyaW5nLmRvbWFpblwiO1xuZXhwb3J0IHtHaXRSZXBvfSBmcm9tIFwiLi9zbWFydHN0cmluZy5naXRcIjtcbmV4cG9ydCBsZXQgZG9ja2VyID0gU21hcnRzdHJpbmdEb2NrZXI7XG5leHBvcnQgbGV0IHR5cGVzY3JpcHQgPSBTbWFydHN0cmluZ1R5cGVzY3JpcHQ7Il19
--- a/dist/smartstring.docker.d.ts
+++ b/dist/smartstring.docker.d.ts
@ -1,7 +0,0 @@
-import "typings-global";
-/**
- * converts an erray of env strings from docker remote api to an usable object.
- * @param envArrayArg
- * @returns {}
- */
-export declare let makeEnvObject: (envArrayArg: string[]) => {};
--- a/dist/smartstring.docker.js
+++ b/dist/smartstring.docker.js
@ -1,19 +0,0 @@
-"use strict";
-require("typings-global");
-/**
- * converts an erray of env strings from docker remote api to an usable object.
- * @param envArrayArg
- * @returns {}
- */
-exports.makeEnvObject = function (envArrayArg) {
-    var returnObject = {};
-    var regexString = /(.*)=(.*)/;
-    for (var envKey in envArrayArg) {
-        var regexMatches = regexString.exec(envArrayArg[envKey]);
-        returnObject[regexMatches[1]] = regexMatches[2];
-    }
-    ;
-    return returnObject;
-};
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLmRvY2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBR3ZCOzs7O0dBSUc7QUFDUSxxQkFBYSxHQUFHLFVBQVMsV0FBb0I7SUFDcEQsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFDO0lBQ3RCLElBQUksV0FBVyxHQUFHLFdBQVcsQ0FBQztJQUM5QixHQUFHLENBQUEsQ0FBQyxJQUFJLE1BQU0sSUFBSSxXQUFXLENBQUMsQ0FBQSxDQUFDO1FBQzNCLElBQUksWUFBWSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDekQsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0sQ0FBQyxZQUFZLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6InNtYXJ0c3RyaW5nLmRvY2tlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRzdHJpbmcucGx1Z2luc1wiKTtcblxuLyoqXG4gKiBjb252ZXJ0cyBhbiBlcnJheSBvZiBlbnYgc3RyaW5ncyBmcm9tIGRvY2tlciByZW1vdGUgYXBpIHRvIGFuIHVzYWJsZSBvYmplY3QuXG4gKiBAcGFyYW0gZW52QXJyYXlBcmdcbiAqIEByZXR1cm5zIHt9XG4gKi9cbmV4cG9ydCBsZXQgbWFrZUVudk9iamVjdCA9IGZ1bmN0aW9uKGVudkFycmF5QXJnOnN0cmluZ1tdKXtcbiAgICBsZXQgcmV0dXJuT2JqZWN0ID0ge307XG4gICAgbGV0IHJlZ2V4U3RyaW5nID0gLyguKik9KC4qKS87XG4gICAgZm9yKGxldCBlbnZLZXkgaW4gZW52QXJyYXlBcmcpe1xuICAgICAgICBsZXQgcmVnZXhNYXRjaGVzID0gcmVnZXhTdHJpbmcuZXhlYyhlbnZBcnJheUFyZ1tlbnZLZXldKTtcbiAgICAgICAgcmV0dXJuT2JqZWN0W3JlZ2V4TWF0Y2hlc1sxXV0gPSByZWdleE1hdGNoZXNbMl07XG4gICAgfTtcbiAgICByZXR1cm4gcmV0dXJuT2JqZWN0O1xufTsiXX0=
--- a/dist/smartstring.domain.d.ts
+++ b/dist/smartstring.domain.d.ts
@ -1,15 +0,0 @@
-import "typings-global";
-export declare class Domain {
-    fullName: string;
-    level1: string;
-    level2: string;
-    level3: string;
-    level4: string;
-    level5: string;
-    protocol: string;
-    zoneName: string;
-    topLevel: string;
-    domainName: any;
-    subDomain: any;
-    constructor(domainStringArg: string);
-}
--- a/dist/smartstring.domain.js
+++ b/dist/smartstring.domain.js
--- a/dist/smartstring.git.d.ts
+++ b/dist/smartstring.git.d.ts
@ -1,10 +0,0 @@
-import "typings-global";
-export declare class GitRepo {
-    host: string;
-    user: string;
-    repo: string;
-    accessToken: string;
-    sshUrl: string;
-    httpsUrl: string;
-    constructor(stringArg: string, tokenArg?: string);
-}
--- a/dist/smartstring.git.js
+++ b/dist/smartstring.git.js
@ -1,51 +0,0 @@
-"use strict";
-require("typings-global");
-var plugins = require("./smartstring.plugins");
-/* ---------------------------------------------- *
- * ------------------ classes ------------------- *
- * ---------------------------------------------- */
-var GitRepo = (function () {
-    function GitRepo(stringArg, tokenArg) {
-        var regexMatches = gitRegex(stringArg);
-        this.host = regexMatches[1];
-        this.user = regexMatches[2];
-        this.repo = regexMatches[3];
-        this.accessToken = tokenArg;
-        this.sshUrl = gitLink(this.host, this.user, this.repo, this.accessToken, "ssh");
-        this.httpsUrl = gitLink(this.host, this.user, this.repo, this.accessToken, "https");
-    }
-    ;
-    return GitRepo;
-}());
-exports.GitRepo = GitRepo;
-/* ---------------------------------------------- *
- * ------------------ helpers ------------------- *
- * ---------------------------------------------- */
-var gitRegex = function (stringArg) {
-    var regexString = /([a-zA-Z0-9\-\.]*)(?:\/|\:)([a-zA-Z0-9\-]*)(?:\/)([a-zA-Z0-9\-]*)(?:\.git)/;
-    var regexMatches = regexString.exec(stringArg);
-    return regexMatches;
-};
-var gitLink = function (hostArg, userArg, repoArg, tokenArg, linkTypeArg) {
-    if (tokenArg === void 0) { tokenArg = ""; }
-    var returnString;
-    if (tokenArg !== "") {
-        tokenArg = tokenArg + "@";
-    }
-    switch (linkTypeArg) {
-        case "https":
-            returnString = "https://" +
-                tokenArg + hostArg + "/" + userArg + "/" + repoArg + ".git";
-            break;
-        case "ssh":
-            returnString = "git@" +
-                hostArg + ":" + userArg + "/" + repoArg + ".git";
-            break;
-        default:
-            plugins.beautylog.error("Link Type " + linkTypeArg + " not known");
-            break;
-    }
-    return returnString;
-};
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLmdpdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBQ3ZCLElBQU8sT0FBTyxXQUFXLHVCQUF1QixDQUFDLENBQUM7QUFFbEQ7O29EQUVvRDtBQUNwRDtJQU9JLGlCQUFZLFNBQWdCLEVBQUMsUUFBZ0I7UUFDekMsSUFBSSxZQUFZLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxJQUFJLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzVCLElBQUksQ0FBQyxJQUFJLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzVCLElBQUksQ0FBQyxJQUFJLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzVCLElBQUksQ0FBQyxXQUFXLEdBQUcsUUFBUSxDQUFDO1FBQzVCLElBQUksQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBQyxJQUFJLENBQUMsSUFBSSxFQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDN0UsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksRUFBQyxJQUFJLENBQUMsSUFBSSxFQUFDLElBQUksQ0FBQyxJQUFJLEVBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNyRixDQUFDOztJQUNMLGNBQUM7QUFBRCxDQWhCQSxBQWdCQyxJQUFBO0FBaEJZLGVBQU8sVUFnQm5CLENBQUE7QUFFRDs7b0RBRW9EO0FBQ3BELElBQUksUUFBUSxHQUFHLFVBQVMsU0FBZ0I7SUFDcEMsSUFBSSxXQUFXLEdBQUcsNEVBQTRFLENBQUM7SUFDL0YsSUFBSSxZQUFZLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMvQyxNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxHQUFHLFVBQVMsT0FBYyxFQUFFLE9BQWMsRUFBRSxPQUFjLEVBQUUsUUFBb0IsRUFBRSxXQUFXO0lBQWpDLHdCQUFvQixHQUFwQixhQUFvQjtJQUN2RixJQUFJLFlBQVksQ0FBQztJQUNqQixFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssRUFBRSxDQUFDLENBQUEsQ0FBQztRQUNqQixRQUFRLEdBQUcsUUFBUSxHQUFHLEdBQUcsQ0FBQTtJQUM3QixDQUFDO0lBQ0QsTUFBTSxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztRQUNsQixLQUFLLE9BQU87WUFDUixZQUFZLEdBQUksVUFBVTtnQkFDdEIsUUFBUSxHQUFHLE9BQU8sR0FBRyxHQUFHLEdBQUcsT0FBTyxHQUFHLEdBQUcsR0FBRyxPQUFPLEdBQUcsTUFBTSxDQUFDO1lBQ2hFLEtBQUssQ0FBQztRQUNWLEtBQUssS0FBSztZQUNOLFlBQVksR0FBRyxNQUFNO2dCQUNqQixPQUFPLEdBQUcsR0FBRyxHQUFHLE9BQU8sR0FBRyxHQUFHLEdBQUcsT0FBTyxHQUFHLE1BQU0sQ0FBQztZQUNyRCxLQUFLLENBQUM7UUFDVjtZQUNJLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFlBQVksR0FBRyxXQUFXLEdBQUcsWUFBWSxDQUFDLENBQUM7WUFDbkUsS0FBSyxDQUFDO0lBQ2QsQ0FBQztJQUNELE1BQU0sQ0FBQyxZQUFZLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6InNtYXJ0c3RyaW5nLmdpdC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRzdHJpbmcucGx1Z2luc1wiKTtcblxuLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqXG4gKiAtLS0tLS0tLS0tLS0tLS0tLS0gY2xhc3NlcyAtLS0tLS0tLS0tLS0tLS0tLS0tICpcbiAqIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi9cbmV4cG9ydCBjbGFzcyBHaXRSZXBvIHtcbiAgICBob3N0OnN0cmluZztcbiAgICB1c2VyOnN0cmluZztcbiAgICByZXBvOnN0cmluZztcbiAgICBhY2Nlc3NUb2tlbjpzdHJpbmc7XG4gICAgc3NoVXJsOnN0cmluZztcbiAgICBodHRwc1VybDpzdHJpbmc7XG4gICAgY29uc3RydWN0b3Ioc3RyaW5nQXJnOnN0cmluZyx0b2tlbkFyZz86c3RyaW5nKXtcbiAgICAgICAgbGV0IHJlZ2V4TWF0Y2hlcyA9IGdpdFJlZ2V4KHN0cmluZ0FyZyk7XG4gICAgICAgIHRoaXMuaG9zdCA9IHJlZ2V4TWF0Y2hlc1sxXTtcbiAgICAgICAgdGhpcy51c2VyID0gcmVnZXhNYXRjaGVzWzJdO1xuICAgICAgICB0aGlzLnJlcG8gPSByZWdleE1hdGNoZXNbM107XG4gICAgICAgIHRoaXMuYWNjZXNzVG9rZW4gPSB0b2tlbkFyZztcbiAgICAgICAgdGhpcy5zc2hVcmwgPSBnaXRMaW5rKHRoaXMuaG9zdCx0aGlzLnVzZXIsdGhpcy5yZXBvLHRoaXMuYWNjZXNzVG9rZW4sIFwic3NoXCIpO1xuICAgICAgICB0aGlzLmh0dHBzVXJsID0gZ2l0TGluayh0aGlzLmhvc3QsdGhpcy51c2VyLHRoaXMucmVwbyx0aGlzLmFjY2Vzc1Rva2VuLCBcImh0dHBzXCIpO1xuICAgIH07XG59XG5cbi8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKlxuICogLS0tLS0tLS0tLS0tLS0tLS0tIGhlbHBlcnMgLS0tLS0tLS0tLS0tLS0tLS0tLSAqXG4gKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tICovXG5sZXQgZ2l0UmVnZXggPSBmdW5jdGlvbihzdHJpbmdBcmc6c3RyaW5nKXtcbiAgICBsZXQgcmVnZXhTdHJpbmcgPSAvKFthLXpBLVowLTlcXC1cXC5dKikoPzpcXC98XFw6KShbYS16QS1aMC05XFwtXSopKD86XFwvKShbYS16QS1aMC05XFwtXSopKD86XFwuZ2l0KS87XG4gICAgbGV0IHJlZ2V4TWF0Y2hlcyA9IHJlZ2V4U3RyaW5nLmV4ZWMoc3RyaW5nQXJnKTtcbiAgICByZXR1cm4gcmVnZXhNYXRjaGVzO1xufTtcblxubGV0IGdpdExpbmsgPSBmdW5jdGlvbihob3N0QXJnOnN0cmluZywgdXNlckFyZzpzdHJpbmcsIHJlcG9Bcmc6c3RyaW5nLCB0b2tlbkFyZzpzdHJpbmcgPSBcIlwiLCBsaW5rVHlwZUFyZyk6c3RyaW5ne1xuICAgIGxldCByZXR1cm5TdHJpbmc7XG4gICAgaWYgKHRva2VuQXJnICE9PSBcIlwiKXtcbiAgICAgICAgdG9rZW5BcmcgPSB0b2tlbkFyZyArIFwiQFwiXG4gICAgfVxuICAgIHN3aXRjaCAobGlua1R5cGVBcmcpIHtcbiAgICAgICAgY2FzZSBcImh0dHBzXCI6XG4gICAgICAgICAgICByZXR1cm5TdHJpbmcgPSAgXCJodHRwczovL1wiICtcbiAgICAgICAgICAgICAgICB0b2tlbkFyZyArIGhvc3RBcmcgKyBcIi9cIiArIHVzZXJBcmcgKyBcIi9cIiArIHJlcG9BcmcgKyBcIi5naXRcIjtcbiAgICAgICAgICAgIGJyZWFrO1xuICAgICAgICBjYXNlIFwic3NoXCI6XG4gICAgICAgICAgICByZXR1cm5TdHJpbmcgPSBcImdpdEBcIiArXG4gICAgICAgICAgICAgICAgaG9zdEFyZyArIFwiOlwiICsgdXNlckFyZyArIFwiL1wiICsgcmVwb0FyZyArIFwiLmdpdFwiO1xuICAgICAgICAgICAgYnJlYWs7XG4gICAgICAgIGRlZmF1bHQ6XG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5lcnJvcihcIkxpbmsgVHlwZSBcIiArIGxpbmtUeXBlQXJnICsgXCIgbm90IGtub3duXCIpO1xuICAgICAgICAgICAgYnJlYWs7XG4gICAgfVxuICAgIHJldHVybiByZXR1cm5TdHJpbmc7XG59OyJdfQ==
--- a/dist/smartstring.plugins.d.ts
+++ b/dist/smartstring.plugins.d.ts
@ -1,2 +0,0 @@
-import "typings-global";
-export import beautylog = require("beautylog");
--- a/dist/smartstring.plugins.js
+++ b/dist/smartstring.plugins.js
@ -1,5 +0,0 @@
-"use strict";
-require("typings-global");
-exports.beautylog = require("beautylog");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBRVAsQ0FBQyxDQUZzQjtBQUVULGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUMiLCJmaWxlIjoic21hcnRzdHJpbmcucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcblxuZXhwb3J0IGltcG9ydCBiZWF1dHlsb2cgPSByZXF1aXJlKFwiYmVhdXR5bG9nXCIpOyJdfQ==
--- a/dist/smartstring.typescript.d.ts
+++ b/dist/smartstring.typescript.d.ts
@ -1,2 +0,0 @@
-import "typings-global";
-export declare let regexReferencePath: RegExp;
--- a/dist/smartstring.typescript.js
+++ b/dist/smartstring.typescript.js
@ -1,5 +0,0 @@
-"use strict";
-require("typings-global");
-exports.regexReferencePath = /\/\/\/\s*<reference\s+path\s*=\s*["|'].*["|']\s*\/>\s*[\\n]?/;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLnR5cGVzY3JpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQ1AsQ0FBQyxDQURzQjtBQUdaLDBCQUFrQixHQUFHLDhEQUE4RCxDQUFBIiwiZmlsZSI6InNtYXJ0c3RyaW5nLnR5cGVzY3JpcHQuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3NtYXJ0c3RyaW5nLnBsdWdpbnNcIik7XG5cbmV4cG9ydCBsZXQgcmVnZXhSZWZlcmVuY2VQYXRoID0gL1xcL1xcL1xcL1xccyo8cmVmZXJlbmNlXFxzK3BhdGhcXHMqPVxccypbXCJ8J10uKltcInwnXVxccypcXC8+XFxzKltcXFxcbl0/LyJdfQ==
--- a/npmextra.json
+++ b/npmextra.json
@ -0,0 +1,13 @@
+{
+  "npmci": {
+    "npmGlobalTools": [
+      "@gitzone/npmts"
+    ],
+    "npmAccessLevel": "public"
+  },
+  "npmdocker": {
+    "baseImage": "hosttoday/ht-docker-node:npmci",
+    "command": "npmci node install stable && npmci npm install && npmci npm test",
+    "dockerSock": false
+  }
+}
--- a/package-lock.json
+++ b/package-lock.json
@ -0,0 +1,947 @@
+{
+  "name": "smartstring",
+  "version": "3.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@airbnb/node-memwatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@airbnb/node-memwatch/-/node-memwatch-1.0.2.tgz",
+      "integrity": "sha512-2R+MEEMSTUdKwQ6NFWkyA/UNoSjL1tMldZqJbZpgXSwNMBzlNlkUWEXKu9RqTTMkDqJRfGJ2VDs8gPlPK2APDQ==",
+      "dev": true,
+      "requires": {
+        "bindings": "^1.3.0",
+        "nan": "^2.9.2"
+      }
+    },
+    "@gitzone/tsrun": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.9.tgz",
+      "integrity": "sha512-MbCLj4hSK5nY6cMqT0OxY0BrXffmiC1Rjbzan8CmEpB8OttaAJT+zsJErJWhI+pk4s75Te73PyhHYaJAXUoJhw==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartfile": "^6.0.3",
+        "ts-node": "^7.0.0",
+        "typescript": "^2.9.1"
+      }
+    },
+    "@pushrocks/smartdelay": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.1.tgz",
+      "integrity": "sha512-olWwh2/JWfhmYdgqrR5RdSsgv1GlXBnbP+XKUrdKVk3dcCzkoqDx9lRE9NfpoCg1cUM2VMxbTVgTW9PWyexEuw==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5"
+      }
+    },
+    "@pushrocks/smartfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.3.tgz",
+      "integrity": "sha512-oYnLQzY/R6kVNerbWY4WwnPvdxXldrzMPWcB9j0aAdSDSqGwBEO1/ZFTQuNzN5MmPopoYmJrc06ZmI6dm4OJmw==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@pushrocks/smartrequest": "^1.0.15",
+        "@types/fs-extra": "^5.0.3",
+        "@types/vinyl": "^2.0.2",
+        "fs-extra": "^6.0.1",
+        "glob": "^7.1.2",
+        "js-yaml": "^3.10.0",
+        "smartpath": "^3.2.8",
+        "vinyl-file": "^3.0.0"
+      }
+    },
+    "@pushrocks/smartpromise": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
+      "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
+      "dev": true
+    },
+    "@pushrocks/smartrequest": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.1.12.tgz",
+      "integrity": "sha512-8vDpYUADkbJFdxDcHQJyJBpc66+cvsRAJdQ6SwMirz5cIeWNlLSR/PVrdGQ94z5tSusf4mwnODk2Ai9smN6XSA==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@types/form-data": "^2.2.1",
+        "form-data": "^2.3.2"
+      }
+    },
+    "@pushrocks/tapbundle": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.1.tgz",
+      "integrity": "sha512-QWVz5EwB3sjjqHTMa22xuw78TBgVTyqKTF5H6HT9d/rvxL5Ag4ZrTuoadMPcU9hRBx9gtPsKbWq4lEwOHdCmLA==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartdelay": "^2.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "early": "^2.1.1",
+        "leakage": "^0.4.0",
+        "smartchai": "^2.0.1"
+      }
+    },
+    "@types/chai": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.4.tgz",
+      "integrity": "sha512-h6+VEw2Vr3ORiFCyyJmcho2zALnUq9cvdB/IO8Xs9itrJVCenC7o26A6+m7D0ihTTr65eS259H5/Ghl/VjYs6g==",
+      "dev": true
+    },
+    "@types/chai-as-promised": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.0.tgz",
+      "integrity": "sha512-MFiW54UOSt+f2bRw8J7LgQeIvE/9b4oGvwU7XW30S9QGAiHGnU/fmiOprsyMkdmH2rl8xSPc0/yrQw8juXU6bQ==",
+      "dev": true,
+      "requires": {
+        "@types/chai": "*"
+      }
+    },
+    "@types/chai-string": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.1.tgz",
+      "integrity": "sha512-aRNMs6TKgjgPlCHwDfq/YNy5VtRR2hJ4AUWByddrT0TRVVD8eX4MiHW6/iHvmQHRlVuuPZcwnTUE7b4yFt7bEA==",
+      "dev": true,
+      "requires": {
+        "@types/chai": "*"
+      }
+    },
+    "@types/form-data": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
+      "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/fs-extra": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.4.tgz",
+      "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "10.5.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz",
+      "integrity": "sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q==",
+      "dev": true
+    },
+    "@types/vinyl": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.2.tgz",
+      "integrity": "sha512-2iYpNuOl98SrLPBZfEN9Mh2JCJ2EI9HU35SfgBEb51DcmaHkhp8cKMblYeBqMQiwXMgAD3W60DbQ4i/UdLiXhw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "ansi-256-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz",
+      "integrity": "sha1-kQ3lDvzHwJ49gvL4er1rcAwYgYo=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "beautycolor": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/beautycolor/-/beautycolor-1.0.11.tgz",
+      "integrity": "sha512-Uxl/39+2uqixPzsrV+0NOHf0sJlWmsKnRTV0oz8+bfwnHPA/E+SZuh3Upn3OXobv0W7LZg5BVoLj1nkMj7m5jA==",
+      "dev": true,
+      "requires": {
+        "ansi-256-colors": "^1.1.0",
+        "typings-global": "^1.0.14"
+      }
+    },
+    "bindings": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
+      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+      "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
+      "dev": true
+    },
+    "chai": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
+      "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.0.1",
+        "check-error": "^1.0.1",
+        "deep-eql": "^3.0.0",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.0.0",
+        "type-detect": "^4.0.0"
+      }
+    },
+    "chai-as-promised": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
+      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "dev": true,
+      "requires": {
+        "check-error": "^1.0.2"
+      }
+    },
+    "chai-string": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.4.0.tgz",
+      "integrity": "sha1-NZFAwFHTak5LGl/GuRAVL0OKjUk=",
+      "dev": true
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "clone": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
+    },
+    "clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
+      "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+    },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "early": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/early/-/early-2.1.1.tgz",
+      "integrity": "sha1-hB4jJU6l3FTYr67ugvWrZcAO4jw=",
+      "dev": true,
+      "requires": {
+        "beautycolor": "^1.0.7",
+        "smartq": "^1.1.1",
+        "typings-global": "^1.0.16"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
+      }
+    },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "first-chunk-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
+      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs-extra": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "home": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/home/-/home-1.0.1.tgz",
+      "integrity": "sha1-lqQjzrSbmDeP9e886uBZpVf53TU=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.1"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
+      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q=="
+    },
+    "js-yaml": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+    },
+    "leakage": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/leakage/-/leakage-0.4.0.tgz",
+      "integrity": "sha512-x7gYK5n5dPkHDZWJ2Kh8Ag1hZNzUh+HtXn8Bv1aDdN6o6ONPCJ8sOfFq+kxcULJFp3lXaCjXb3iXOLmQRbBLwA==",
+      "dev": true,
+      "requires": {
+        "@airbnb/node-memwatch": "^1.0.2",
+        "es6-error": "^4.0.2",
+        "left-pad": "^1.1.3",
+        "minimist": "^1.2.0",
+        "pretty-bytes": "^4.0.2"
+      }
+    },
+    "left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "dev": true
+    },
+    "make-error": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
+      "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
+      "dev": true
+    },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "dev": true,
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+      "dev": true
+    },
+    "normalize-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-newline/-/normalize-newline-3.0.0.tgz",
+      "integrity": "sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM="
+    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pretty-bytes": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
+      "requires": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "smartchai": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/smartchai/-/smartchai-2.0.1.tgz",
+      "integrity": "sha512-9M+R56OhAHXScxgr2vzQqxGx0XMS0QXriNZuP7hjlbVbo2FUT+l60iEzbwPt9Ga+5u2cEEjSSoZEQVqlROaddA==",
+      "dev": true,
+      "requires": {
+        "@types/chai": "^4.1.2",
+        "@types/chai-as-promised": "^7.1.0",
+        "@types/chai-string": "^1.4.0",
+        "chai": "^4.1.2",
+        "chai-as-promised": "^7.1.1",
+        "chai-string": "^1.4.0"
+      }
+    },
+    "smartpath": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/smartpath/-/smartpath-3.2.8.tgz",
+      "integrity": "sha1-SDS9OouuIpW6rK26I8h6UBlS+UA=",
+      "dev": true,
+      "requires": {
+        "home": "^1.0.1",
+        "typings-global": "^1.0.14"
+      }
+    },
+    "smartq": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.8.tgz",
+      "integrity": "sha512-FURlYW/C3bLeZjJcBVyw7bxCyQoCXiXbLCZcDUKznhXHaLu35c8m33/a2H8CA0rtb82lvzN8dRLnBZAcNMzNHQ==",
+      "dev": true,
+      "requires": {
+        "util.promisify": "^1.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+      "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-bom-buf": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz",
+      "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.1"
+      }
+    },
+    "strip-bom-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
+      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
+      "dev": true,
+      "requires": {
+        "first-chunk-stream": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      }
+    },
+    "strip-indent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g="
+    },
+    "ts-node": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.0.tgz",
+      "integrity": "sha512-klJsfswHP0FuOLsvBZ/zzCfUvakOSSxds78mVeK7I+qP76YWtxf16hEZsp3U+b0kIo82R5UatGFeblYMqabb2Q==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.0",
+        "buffer-from": "^1.1.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^2.0.0"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "typings-global": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/typings-global/-/typings-global-1.0.28.tgz",
+      "integrity": "sha512-6VOwJWEY2971HOMHu/7sURzUXiD4/LiMJPsMAOqkHHAtS3MVpLFE5gzTiHilsH9KY5VE1mBQirWIgWFsDuo90A==",
+      "dev": true
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "vinyl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      }
+    },
+    "vinyl-file": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-3.0.0.tgz",
+      "integrity": "sha1-sQTZ5ECf+jJfqt1SBkLQo7SIs2U=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.3.0",
+        "strip-bom-buf": "^1.0.0",
+        "strip-bom-stream": "^2.0.0",
+        "vinyl": "^2.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+      "dev": true
+    }
+  }
+}
--- a/package.json
+++ b/package.json
@ -1,11 +1,13 @@
 {
-  "name": "smartstring",
-  "version": "2.0.9",
+  "name": "@pushrocks/smartstring",
+  "version": "3.0.0",
+  "private": false,
  "description": "handle strings in smart ways. TypeScript ready.",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "scripts": {
-    "test": "(npmts)"
+    "test": "tsrun test/test.base64.ts",
+    "build": "(npmts)"
  },
  "repository": {
    "type": "git",
@ -22,12 +24,14 @@
  },
  "homepage": "https://gitlab.com/pushrocks/smartstring#readme",
  "devDependencies": {
-    "npmts-g": "^5.2.6",
-    "should": "^9.0.2",
-    "typings-test": "^1.0.1"
+    "@gitzone/tsrun": "^1.1.9",
+    "@pushrocks/tapbundle": "^3.0.1"
  },
  "dependencies": {
-    "beautylog": "^5.0.12",
-    "typings-global": "^1.0.3"
+    "crypto-random-string": "^1.0.0",
+    "js-base64": "^2.4.8",
+    "normalize-newline": "^3.0.0",
+    "randomatic": "^3.0.0",
+    "strip-indent": "^2.0.0"
  }
 }
--- a/test/test.base64.ts
+++ b/test/test.base64.ts
@ -0,0 +1,16 @@
+import * as smartstring from '../ts/index';
+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);
+});
+tap.test('expect read output a file as base64 and base64uri', async () => {
+  expect(testBase64.base64String).not.equal(testBase64.base64UriString);
+  let testBase64_2 = new smartstring.Base64(testBase64.base64UriString, 'base64uri');
+  expect(testBase64_2.simpleString).equal(testBase64.simpleString);
+});
+
+tap.start();
--- a/test/test.d.ts
+++ b/test/test.d.ts
@ -1 +0,0 @@
-import "typings-test";
--- a/test/test.docker.ts
+++ b/test/test.docker.ts
@ -0,0 +1,12 @@
+import * as smartstring from '../ts/index';
+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');
+});
+
+tap.start();
--- a/test/test.domain.ts
+++ b/test/test.domain.ts
@ -0,0 +1,32 @@
+import * as smartstring from '../ts/index';
+import { tap, expect } from '@pushrocks/tapbundle';
+
+// Domain
+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);
+  console.log(testDomain);
+});
+tap.test('expect have a .topLevel', async () => {
+  expect(testDomain.topLevel).equal('level1D');
+});
+tap.test('expect have a .level2', async () => {
+  expect(testDomain.level2).equal('level2D');
+});
+tap.test('expect have a .level3', async () => {
+  expect(testDomain.level3).equal('level3D');
+});
+tap.test('expect have the correct dns zone name', async () => {
+  expect(testDomain.zoneName).equal('level2D.level1D');
+});
+tap.test('expect have the correct protocol', async () => {
+  expect(testDomain.protocol).equal('https');
+});
+tap.test('testDomain2 expect be a basic domain', async () => {
+  testDomain2 = new smartstring.Domain('bleu.de');
+  console.log(testDomain2);
+});
+
+tap.start();
--- a/test/test.git.ts
+++ b/test/test.git.ts
@ -0,0 +1,26 @@
+import * as smartstring from '../ts/index';
+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);
+});
+tap.test('expect return a .host', async () => {
+  expect(testGit.host).equal('github.com');
+});
+tap.test('expect return a .user', async () => {
+  expect(testGit.user).equal('pushrocks');
+});
+tap.test('expect return a .repo', async () => {
+  expect(testGit.repo).equal('smartstring');
+});
+tap.test('expect return a .httpsUrl', async () => {
+  expect(testGit.httpsUrl).equal('https://github.com/pushrocks/smartstring.git');
+});
+tap.test('expect return a .sshUrl', async () => {
+  expect(testGit.sshUrl).equal('git@github.com:pushrocks/smartstring.git');
+});
+
+tap.start();
--- a/test/test.indent.ts
+++ b/test/test.indent.ts
@ -0,0 +1,28 @@
+import * as smartstring from '../ts/index';
+import { tap, expect } from '@pushrocks/tapbundle';
+
+// indent
+let testString = `
+base
+    expect be indented
+        some more
+
+base
+    indented
+`;
+
+// normalize
+tap.test('expect normalize a string', async () => {
+  testString = smartstring.indent.normalize(testString);
+  console.log(testString);
+  let zoneNameArg = 'test1';
+  let destinationIpArg = '111';
+});
+
+// indent with prefix
+tap.test('expect indent', async () => {
+  testString = smartstring.indent.indentWithPrefix(testString, '>> ');
+  console.log(testString);
+});
+
+tap.start();
--- a/test/test.js
+++ b/test/test.js
--- a/test/test.js.map
+++ b/test/test.js.map
@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,IAAI,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE/B,QAAQ,CAAC,aAAa,EAAC;IACnB,QAAQ,CAAC,QAAQ,EAAC;QACd,IAAI,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QAClF,EAAE,CAAC,uBAAuB,EAAC;YACvB,OAAO,CAAC,IAAI;iBACP,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAC;YACvB,OAAO,CAAC,IAAI;iBACP,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAC;YACvB,OAAO,CAAC,IAAI;iBACP,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,2BAA2B,EAAC;YAC3B,OAAO,CAAC,QAAQ;iBACX,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,yBAAyB,EAAC;YACzB,OAAO,CAAC,MAAM;iBACT,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,SAAS,EAAC;QACf,QAAQ,CAAC,gBAAgB,EAAC;YACtB,EAAE,CAAC,4BAA4B,EAAC;gBAC5B,IAAI,cAAc,GAAG,CAAC,6BAA6B,EAAC,8BAA8B,CAAC,CAAC;gBACpF,IAAI,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;gBACjE,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACtD,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAC"}
--- a/test/test.ts
+++ b/test/test.ts
@ -1,83 +0,0 @@
-import "typings-test"
-import * as smartstring from "../dist/index";
-let should = require("should");
-
-describe("smartstring",function(){
-    describe(".Domain class",function(){
-        let testDomain:smartstring.Domain;
-        let testDomain2:smartstring.Domain;
-        it("should create a new Domain object",function(){
-            testDomain = new smartstring.Domain("https://level3D.level2D.level1D");
-            testDomain.should.be.instanceof(smartstring.Domain);
-            console.log(testDomain);
-        });
-        it("should have a .topLevel",function(){
-            testDomain.topLevel.should.equal("level1D");
-        });
-        it("should have a .level2",function(){
-            testDomain.level2.should.equal("level2D");
-        });
-        it("should have a .level3",function(){
-            testDomain.level3.should.equal("level3D");
-        });
-        it("should have the correct dns zone name",function(){
-            testDomain.zoneName.should.equal("level2D.level1D");
-        })
-        it ("should have the correct protocol",function(){
-            testDomain.protocol.should.equal("https");
-        })
-        it("testDomain2 should be a basic domain",function(){
-            testDomain2 = new smartstring.Domain("bleu.de");
-            console.log(testDomain2);
-        });
-    })
-    describe(".Git class",function(){
-        let testGit:smartstring.GitRepo;
-        it("should create a new Git class GitRepo",function(){
-            testGit = new smartstring.GitRepo("git+https://github.com/pushrocks/smartstring.git");
-            testGit.should.be.instanceof(smartstring.GitRepo);
-        })
-        it("should return a .host",function(){
-            testGit.host
-                .should.equal("github.com");
-        });
-        it("should return a .user",function(){
-            testGit.user
-                .should.equal("pushrocks");
-        });
-        it("should return a .repo",function(){
-            testGit.repo
-                .should.equal("smartstring");
-        });
-        it("should return a .httpsUrl",function(){
-            testGit.httpsUrl
-                .should.equal("https://github.com/pushrocks/smartstring.git");
-        });
-        it("should return a .sshUrl",function(){
-            testGit.sshUrl
-                .should.equal("git@github.com:pushrocks/smartstring.git");
-        });
-    })
-    describe(".docker",function(){
-        describe(".makeEnvObject",function(){
-            it("should create a Env Object",function(){
-                let envStringArray = ["VIRTUAL_HOST=sub.domain.tld","DEFAULT_HOST=some.domain.com"];
-                let envObject:any = smartstring.docker.makeEnvObject(envStringArray);
-                envObject.VIRTUAL_HOST.should.equal("sub.domain.tld");
-                envObject.DEFAULT_HOST.should.equal("some.domain.com");
-            })
-        })
-    })
-    describe(".typescript",function(){
-        describe(".referenceRegex",function(){
-            it("should match reference paths",function(){
-                smartstring.typescript.regexReferencePath.test("/// <reference path=\"\" />")
-                    .should.be.true();
-                smartstring.typescript.regexReferencePath.test("/// <reference path='' />")
-                    .should.be.true();
-                smartstring.typescript.regexReferencePath.test("/// <referencepath=\"\" />")
-                    .should.be.false();
-            })
-        })
-    })
-});
--- a/test/test.typescript.ts
+++ b/test/test.typescript.ts
@ -0,0 +1,16 @@
+import * as smartstring from '../ts/index';
+import { tap, expect } from '@pushrocks/tapbundle';
+
+// typscript
+tap.test('expect match reference paths', async () => {
+  // tslint:disable-next-line:no-unused-expression
+  expect(smartstring.typescript.regexReferencePath.test('/// <reference path="" />')).to.be.true;
+
+  // tslint:disable-next-line:no-unused-expression
+  expect(smartstring.typescript.regexReferencePath.test("/// <reference path='' />")).to.be.true;
+
+  // tslint:disable-next-line:no-unused-expression
+  expect(smartstring.typescript.regexReferencePath.test('/// <referencepath="" />')).to.be.false;
+});
+
+tap.start();
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,8 +1,11 @@
-import "typings-global"
-import SmartstringDocker = require("./smartstring.docker");
-import SmartstringTypescript = require("./smartstring.typescript");
+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 typescript from './smartstring.typescript';

-export {Domain} from "./smartstring.domain";
-export {GitRepo} from "./smartstring.git";
-export let docker = SmartstringDocker;
-export let typescript = SmartstringTypescript;
+export { create, docker, typescript, normalize, indent };
+
+export { Base64, base64 } from './smartstring.base64';
+export { Domain } from './smartstring.domain';
+export { GitRepo } from './smartstring.git';
--- a/ts/smartstring.base64.ts
+++ b/ts/smartstring.base64.ts
@ -0,0 +1,69 @@
+import * as plugins from './smartstring.plugins';
+
+/**
+ * the type for base 64
+ */
+export type TBase64Input = 'string' | 'base64' | 'base64uri';
+
+/**
+ * handle base64 strings
+ */
+export class Base64 {
+  private refString: string;
+  constructor(inputStringArg, typeArg: TBase64Input) {
+    switch (typeArg) {
+      case 'string': // easiest case
+        this.refString = inputStringArg;
+        break;
+      case 'base64':
+        this.refString = base64.decode(inputStringArg);
+        break;
+      case 'base64uri':
+        this.refString = base64.decode(inputStringArg);
+    }
+  }
+
+  /**
+   * the simple string (unencoded)
+   */
+  get simpleString() {
+    return this.refString;
+  }
+
+  /**
+   * the base64 encoded version of the original string
+   */
+  get base64String() {
+    return base64.encode(this.refString);
+  }
+
+  /**
+   * the base64uri encoded version of the original string
+   */
+  get base64UriString() {
+    return base64.encodeUri(this.refString);
+  }
+}
+
+export let base64 = {
+  /**
+   * encodes the string
+   */
+  encode: (stringArg: string) => {
+    return plugins.jsBase64.encode(stringArg);
+  },
+
+  /**
+   * encodes a stringArg to base64 uri style
+   */
+  encodeUri: (stringArg: string) => {
+    return plugins.jsBase64.encodeURI(stringArg);
+  },
+
+  /**
+   * decodes a base64 encoded string
+   */
+  decode: (stringArg: string) => {
+    return plugins.jsBase64.decode(stringArg);
+  }
+};
--- a/ts/smartstring.create.ts
+++ b/ts/smartstring.create.ts
@ -0,0 +1,13 @@
+import * as plugins from './smartstring.plugins';
+
+export const createRandomString = (
+  patternArg: string,
+  lengthArg: number,
+  optionsArg: any
+): string => {
+  return plugins.randomatic(patternArg, lengthArg, optionsArg);
+};
+
+export const createCryptoRandomString = (lengthArg): string => {
+  return plugins.cryptoRandomString(lengthArg);
+};
--- a/ts/smartstring.docker.ts
+++ b/ts/smartstring.docker.ts
@ -1,17 +1,18 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from './smartstring.plugins';

 /**
 * converts an erray of env strings from docker remote api to an usable object.
 * @param envArrayArg
 * @returns {}
 */
-export let makeEnvObject = function(envArrayArg:string[]){
-    let returnObject = {};
-    let regexString = /(.*)=(.*)/;
-    for(let envKey in envArrayArg){
-        let regexMatches = regexString.exec(envArrayArg[envKey]);
-        returnObject[regexMatches[1]] = regexMatches[2];
-    };
-    return returnObject;
-};
+export const makeEnvObject = function(envArrayArg: string[]) {
+  let returnObject = {};
+  let regexString = /(.*)=(.*)/;
+  if (typeof envArrayArg !== 'undefined') {
+    for (let envKey in envArrayArg) {
+      let regexMatches = regexString.exec(envArrayArg[envKey]);
+      returnObject[regexMatches[1]] = regexMatches[2];
+    }
+  }
+  return returnObject;
+};
--- a/ts/smartstring.domain.ts
+++ b/ts/smartstring.domain.ts
@ -1,63 +1,61 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from './smartstring.plugins';

 export class Domain {
-    fullName:string;
-    level1:string;
-    level2:string;
-    level3:string;
-    level4:string;
-    level5:string;
-    protocol:string;
-    zoneName:string;
-    //aliases
-    topLevel:string;
-    domainName;
-    subDomain;
-    constructor(domainStringArg:string){
-        let regexMatches = domainRegex(domainStringArg);
-        this.fullName = "";
-        for(let i = 1; i <= 5; i++){
-            if(regexMatches[i - 1]) {
-                let localMatch = regexMatches[i - 1]
-                this["level" + i.toString()] = localMatch;
-                if (this.fullName == ""){
-                    this.fullName = localMatch;
-                } else {
-                    this.fullName = localMatch + "." + this.fullName;
-                }
-            } else {
-                this["level" + i.toString()] = undefined;
-            };
-        };
-        this.protocol = protocolRegex(domainStringArg);
-        this.zoneName = this.level2 + "." + this.level1; 
-        
-        // aliases
-        this.topLevel = this.level1;
-        this.domainName = this.level2;
-        this.subDomain = this.level3;
+  fullName: string;
+  level1: string;
+  level2: string;
+  level3: string;
+  level4: string;
+  level5: string;
+  protocol: string;
+  zoneName: string;
+  // aliases
+  topLevel: string;
+  domainName;
+  subDomain;
+  constructor(domainStringArg: string) {
+    let regexMatches = domainRegex(domainStringArg);
+    this.fullName = '';
+    for (let i = 1; i <= 5; i++) {
+      if (regexMatches[i - 1]) {
+        let localMatch = regexMatches[i - 1];
+        this['level' + i.toString()] = localMatch;
+        if (this.fullName === '') {
+          this.fullName = localMatch;
+        } else {
+          this.fullName = localMatch + '.' + this.fullName;
+        }
+      } else {
+        this['level' + i.toString()] = undefined;
+      }
    }
+    this.protocol = protocolRegex(domainStringArg);
+    this.zoneName = this.level2 + '.' + this.level1;
+
+    // aliases
+    this.topLevel = this.level1;
+    this.domainName = this.level2;
+    this.subDomain = this.level3;
+  }
 }

-
-let domainRegex = function(stringArg:string){
-    let 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}$/;
-    let 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
-    let regexMatchesFiltered = regexMatches.filter(function(stringArg:string){
-        return(stringArg != "");
-    });
-    return regexMatchesFiltered;
+let domainRegex = function(stringArg: string) {
+  let 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}$/;
+  let 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
+  let regexMatchesFiltered = regexMatches.filter(function(stringArg: string) {
+    return stringArg !== '';
+  });
+  return regexMatchesFiltered;
 };

-let protocolRegex = function(stringArg:string){
-    let regexString = /^([a-zA-Z0-9]*):\/\//;
-    let regexMatches = regexString.exec(stringArg);
-    if(regexMatches){
-        return regexMatches[1];
-    } else {
-        return undefined;
-    }
-}
+let protocolRegex = function(stringArg: string) {
+  let regexString = /^([a-zA-Z0-9]*):\/\//;
+  let regexMatches = regexString.exec(stringArg);
+  if (regexMatches) {
+    return regexMatches[1];
+  } else {
+    return undefined;
+  }
+};
--- a/ts/smartstring.git.ts
+++ b/ts/smartstring.git.ts
@ -1,53 +1,56 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from './smartstring.plugins';

 /* ---------------------------------------------- *
 * ------------------ classes ------------------- *
 * ---------------------------------------------- */
 export class GitRepo {
-    host:string;
-    user:string;
-    repo:string;
-    accessToken:string;
-    sshUrl:string;
-    httpsUrl:string;
-    constructor(stringArg:string,tokenArg?:string){
-        let regexMatches = gitRegex(stringArg);
-        this.host = regexMatches[1];
-        this.user = regexMatches[2];
-        this.repo = regexMatches[3];
-        this.accessToken = tokenArg;
-        this.sshUrl = gitLink(this.host,this.user,this.repo,this.accessToken, "ssh");
-        this.httpsUrl = gitLink(this.host,this.user,this.repo,this.accessToken, "https");
-    };
+  host: string;
+  user: string;
+  repo: string;
+  accessToken: string;
+  sshUrl: string;
+  httpsUrl: string;
+  constructor(stringArg: string, tokenArg?: string) {
+    let regexMatches = gitRegex(stringArg);
+    this.host = regexMatches[1];
+    this.user = regexMatches[2];
+    this.repo = regexMatches[3];
+    this.accessToken = tokenArg;
+    this.sshUrl = gitLink(this.host, this.user, this.repo, this.accessToken, 'ssh');
+    this.httpsUrl = gitLink(this.host, this.user, this.repo, this.accessToken, 'https');
+  }
 }

 /* ---------------------------------------------- *
 * ------------------ helpers ------------------- *
 * ---------------------------------------------- */
-let gitRegex = function(stringArg:string){
-    let regexString = /([a-zA-Z0-9\-\.]*)(?:\/|\:)([a-zA-Z0-9\-]*)(?:\/)([a-zA-Z0-9\-]*)(?:\.git)/;
-    let regexMatches = regexString.exec(stringArg);
-    return regexMatches;
+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;
 };

-let gitLink = function(hostArg:string, userArg:string, repoArg:string, tokenArg:string = "", linkTypeArg):string{
-    let returnString;
-    if (tokenArg !== ""){
-        tokenArg = tokenArg + "@"
-    }
-    switch (linkTypeArg) {
-        case "https":
-            returnString =  "https://" +
-                tokenArg + hostArg + "/" + userArg + "/" + repoArg + ".git";
-            break;
-        case "ssh":
-            returnString = "git@" +
-                hostArg + ":" + userArg + "/" + repoArg + ".git";
-            break;
-        default:
-            plugins.beautylog.error("Link Type " + linkTypeArg + " not known");
-            break;
-    }
-    return returnString;
-};
+const gitLink = function(
+  hostArg: string,
+  userArg: string,
+  repoArg: string,
+  tokenArg: string = '',
+  linkTypeArg
+): string {
+  let returnString;
+  if (tokenArg !== '') {
+    tokenArg = tokenArg + '@';
+  }
+  switch (linkTypeArg) {
+    case 'https':
+      returnString = 'https://' + tokenArg + hostArg + '/' + userArg + '/' + repoArg + '.git';
+      break;
+    case 'ssh':
+      returnString = 'git@' + hostArg + ':' + userArg + '/' + repoArg + '.git';
+      break;
+    default:
+      console.error('Link Type ' + linkTypeArg + ' not known');
+      break;
+  }
+  return returnString;
+};
--- a/ts/smartstring.indent.ts
+++ b/ts/smartstring.indent.ts
@ -0,0 +1,92 @@
+import * as plugins from './smartstring.plugins';
+
+/**
+ * splits a string into an array
+ * @param stringArg
+ */
+const splitStringAtLineBreak = (stringArg: string): string[] => {
+  let resultArray = stringArg.split('\n');
+  return cleanStringArray(resultArray);
+};
+
+/**
+ * joins a string together again
+ * @param stringArrayArg
+ */
+const joinStringWithLineBreaks = (stringArrayArg: string[]): string => {
+  let resultString: string = '';
+  for (let line of stringArrayArg) {
+    resultString = resultString + line + '\n'; // add new line at end
+  }
+  return resultString;
+};
+
+/**
+ * cleans first and last line in case they are empty
+ * @param stringArrayArg
+ */
+const cleanStringArray = (stringArrayArg: string[]): string[] => {
+  let testRegex = /^[\s]*$/;
+  if (testRegex.test(stringArrayArg[0])) {
+    stringArrayArg.shift();
+  }
+  if (testRegex.test(stringArrayArg[stringArrayArg.length - 1])) {
+    stringArrayArg.pop();
+  }
+  return stringArrayArg;
+};
+
+/**
+ * indent an array
+ * @param stringArg
+ * @param spaceAmount
+ */
+export const indent = (stringArg: string, spaceAmount: number): string => {
+  let localStringArray = splitStringAtLineBreak(stringArg);
+  for (let stringArg of localStringArray) {
+    stringArg = ' '.repeat(spaceAmount) + stringArg;
+  }
+  let resultString = joinStringWithLineBreaks(localStringArray);
+  return resultString;
+};
+
+/**
+ * indents a string with prefix
+ * @param stringArg
+ * @param prefixArg
+ */
+export const indentWithPrefix = (stringArg: string, prefixArg: string): string => {
+  let resultString: string;
+  let stringArray = splitStringAtLineBreak(stringArg);
+  let resultArray: string[] = [];
+  for (let stringItem of stringArray) {
+    resultArray.push(prefixArg + stringItem);
+  }
+  resultString = joinStringWithLineBreaks(resultArray);
+  return resultString;
+};
+
+export const normalize = (stringArg: string): string => {
+  let resultString: string;
+  let splitStringArray: string[] = splitStringAtLineBreak(stringArg);
+  let minCommonLeftOffset: number;
+
+  const deIndentRegex = /^(\s*)/;
+  const emptyLineRegex = /^(\s*)$/;
+
+  for (let stringItem of splitStringArray) {
+    let offsetString = deIndentRegex.exec(stringItem)[1];
+    if (
+      (typeof minCommonLeftOffset === 'undefined' || offsetString.length < minCommonLeftOffset) &&
+      !emptyLineRegex.test(stringItem)
+    ) {
+      minCommonLeftOffset = offsetString.length;
+    }
+  }
+  let resultSplitStringArray = [];
+  for (let stringItem of splitStringArray) {
+    resultSplitStringArray.push(stringItem.substr(minCommonLeftOffset));
+  }
+  resultString = joinStringWithLineBreaks(resultSplitStringArray);
+  return resultString;
+};
--- a/ts/smartstring.normalize.ts
+++ b/ts/smartstring.normalize.ts
@ -0,0 +1,22 @@
+import * as plugins from './smartstring.plugins';
+
+/**
+ * replaces all occurences of something in a string
+ * @param stringArg
+ * @param searchRegExp
+ * @param replacementString
+ */
+export const replaceAll = (stringArg: string, searchRegExp: any, replacementString: string) => {
+  return stringArg.replace(new RegExp(searchRegExp, 'g'), replacementString);
+};
+
+/**
+ * normalizes a string
+ * @param stringArg
+ */
+export const standard = (stringArg: string): string => {
+  let fix1 = plugins.stripIndent(stringArg); // fix indention
+  let fix2 = plugins.normalizeNewline(fix1); // fix newlines
+  let fix3 = replaceAll(fix2, /\t/, ' '); // fix tabs
+  return fix3;
+};
--- a/ts/smartstring.plugins.ts
+++ b/ts/smartstring.plugins.ts
@ -1,3 +1,7 @@
-import "typings-global"
+import 'typings-global';
+export let jsBase64 = require('js-base64').Base64;

-export import beautylog = require("beautylog");
+export let stripIndent = require('strip-indent');
+export let normalizeNewline = require('normalize-newline');
+export let randomatic = require('randomatic');
+export let cryptoRandomString = require('crypto-random-string');
--- a/ts/smartstring.typescript.ts
+++ b/ts/smartstring.typescript.ts
@ -1,4 +1,3 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from './smartstring.plugins';

-export let regexReferencePath = /\/\/\/\s*<reference\s+path\s*=\s*["|'].*["|']\s*\/>\s*[\\n]?/
+export const regexReferencePath = /\/\/\/\s*<reference\s+path\s*=\s*["|'].*["|']\s*\/>\s*[\\n]?/;
--- a/ts/typings.json
+++ b/ts/typings.json
@ -1,7 +0,0 @@
-{
-  "ambientDependencies": {
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
-    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts"
-  }
-}
--- a/tslint.json
+++ b/tslint.json
@ -0,0 +1,3 @@
+{
+    "extends": "tslint-config-standard"
+}
Author	SHA1	Message	Date
Phil Kunz	8c894ea1c1	3.0.0	2018-07-21 14:37:39 +02:00
Phil Kunz	62336aa2cf	BREAKING CHANGE(scope): change scope to @pushrocks	2018-07-21 14:37:39 +02:00
Phil Kunz	e9899e5451	2.0.28	2017-10-26 15:24:13 +02:00
Phil Kunz	235f380139	refactor to const	2017-10-26 15:24:10 +02:00
Phil Kunz	4a94ce3038	2.0.27	2017-10-11 15:18:30 +02:00
Phil Kunz	7c4c787539	add npmextra.json	2017-10-11 15:18:26 +02:00
Phil Kunz	714e3a162c	2.0.26	2017-10-11 14:52:24 +02:00
Phil Kunz	099bf9b270	add create module	2017-10-11 14:52:22 +02:00
Phil Kunz	83279a9c19	2.0.25	2017-10-05 15:56:03 +02:00
Phil Kunz	55d679e5ee	update normalize of smartstring	2017-10-05 15:55:59 +02:00
Phil Kunz	974bf90703	2.0.24	2017-02-19 14:34:04 +01:00
Phil Kunz	93029d1aae	update README	2017-02-19 14:33:00 +01:00
Phil Kunz	3a7740024c	2.0.23	2017-02-19 14:30:51 +01:00
Phil Kunz	a412285862	update dependencies and allow dots in git user and repo names	2017-02-19 14:09:39 +01:00
PhilKunz	a57bd446d0	2.0.22	2016-11-02 23:02:00 +01:00
PhilKunz	afe8d5bc1b	improve README	2016-11-02 23:01:56 +01:00
PhilKunz	576e81588d	2.0.21	2016-11-02 22:55:20 +01:00
PhilKunz	76c590b045	improve README	2016-11-02 22:55:17 +01:00
PhilKunz	bb7caa36ea	2.0.20	2016-11-01 19:00:35 +01:00
PhilKunz	a3a51bf0ca	small export fix	2016-11-01 19:00:32 +01:00
PhilKunz	1684eae1e8	expose base64 functions seperate from class	2016-11-01 18:59:43 +01:00
PhilKunz	39ce541532	2.0.19	2016-11-01 00:37:47 +01:00
PhilKunz	c2a4f05b33	2.0.18	2016-11-01 00:22:52 +01:00
PhilKunz	3858127968	add Base64 handling	2016-11-01 00:22:38 +01:00
PhilKunz	68d0124c24	2.0.17	2016-08-03 15:42:39 +02:00
PhilKunz	16f41a7d63	Merge branch 'master' of gitlab.com:pushrocks/smartstring	2016-08-03 15:42:24 +02:00
PhilKunz	d13dfc9e76	2.0.16	2016-08-03 15:41:54 +02:00
PhilKunz	942f6b37cf	fix docker env null problem	2016-08-03 15:41:36 +02:00
Phil Kunz	211c7c3308	Update .gitlab-ci.yml	2016-07-22 22:34:51 +00:00
Phil Kunz	a55d6d2221	Update README.md	2016-07-21 22:17:56 +00:00
PhilKunz	98ca73d0c7	2.0.15	2016-07-17 17:30:35 +02:00
PhilKunz	ffedc7f601	switched to ES6	2016-07-17 17:30:26 +02:00
LosslessBot	8344fdf7b1	2.0.14	2016-07-08 01:49:41 +02:00
LosslessBot	543dc98961	ignore empty lines for indent.normalize()	2016-07-08 01:49:32 +02:00
LosslessBot	9c60105685	2.0.13	2016-07-08 00:57:27 +02:00
LosslessBot	bdccf2c3a1	now has working indent module	2016-07-08 00:57:11 +02:00
Phil Kunz	34d6df0923	write some tests	2016-07-07 23:35:15 +02:00
Phil Kunz	3d3b07b7cb	implement deindent	2016-07-07 19:53:14 +02:00
LosslessBot	00004f70d6	2.0.12	2016-07-06 10:06:44 +02:00
LosslessBot	2d263244c7	recompile	2016-07-06 10:06:39 +02:00
LosslessBot	8cb1405d99	2.0.11	2016-07-06 10:06:15 +02:00
LosslessBot	d357d6e52d	merged	2016-07-06 10:06:10 +02:00
LosslessBot	c124f90a91	prepare indent functionality	2016-07-06 10:04:25 +02:00
Phil Kunz	4bcf9f941e	2.0.10	2016-06-22 12:55:32 +02:00
Phil Kunz	afb204325b	fix Domain Regex to include - and _	2016-06-22 12:55:29 +02:00
				`@ -1 +0,0 @@`
				{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,IAAI,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE/B,QAAQ,CAAC,aAAa,EAAC;IACnB,QAAQ,CAAC,QAAQ,EAAC;QACd,IAAI,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QAClF,EAAE,CAAC,uBAAuB,EAAC;YACvB,OAAO,CAAC,IAAI;iBACP,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAC;YACvB,OAAO,CAAC,IAAI;iBACP,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAC;YACvB,OAAO,CAAC,IAAI;iBACP,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,2BAA2B,EAAC;YAC3B,OAAO,CAAC,QAAQ;iBACX,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,yBAAyB,EAAC;YACzB,OAAO,CAAC,MAAM;iBACT,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,SAAS,EAAC;QACf,QAAQ,CAAC,gBAAgB,EAAC;YACtB,EAAE,CAAC,4BAA4B,EAAC;gBAC5B,IAAI,cAAc,GAAG,CAAC,6BAA6B,EAAC,8BAA8B,CAAC,CAAC;gBACpF,IAAI,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;gBACjE,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACtD,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAC"}