diff --git a/package-lock.json b/package-lock.json
index 7c940da..dcd4640 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "smartstring",
+ "name": "@pushrocks/smartstring",
"version": "3.0.0",
"lockfileVersion": 1,
"requires": true,
@@ -14,6 +14,55 @@
"nan": "^2.9.2"
}
},
+ "@gitzone/tsbuild": {
+ "version": "2.0.22",
+ "resolved": "https://registry.npmjs.org/@gitzone/tsbuild/-/tsbuild-2.0.22.tgz",
+ "integrity": "sha512-H0rqGVUKXWgxXhkY62kF92WpbS9GSJW27jQXaoyMsQptTQN4HIYKHWZMdO4egkk0/gDmKnBjk8MXg5Rx6efItA==",
+ "dev": true,
+ "requires": {
+ "@pushrocks/smartfile": "^6.0.6",
+ "@pushrocks/smartlog": "^2.0.1",
+ "@pushrocks/smartpath": "^4.0.1",
+ "@pushrocks/smartpromise": "^2.0.5",
+ "typescript": "^3.0.1"
+ },
+ "dependencies": {
+ "@pushrocks/smartfile": {
+ "version": "6.0.6",
+ "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.6.tgz",
+ "integrity": "sha512-vA1+yS6n0kuBZ+Bl30rxOCYvgIj0mo9g303cUpOZR0I781iQVWHcBKRC05FaGDxJD1HuYdvbSK+7vlrzZjVcMw==",
+ "dev": true,
+ "requires": {
+ "@pushrocks/smartpath": "^4.0.1",
+ "@pushrocks/smartpromise": "^2.0.5",
+ "@pushrocks/smartrequest": "^1.1.12",
+ "@types/fs-extra": "^5.0.4",
+ "@types/vinyl": "^2.0.2",
+ "fs-extra": "^7.0.0",
+ "glob": "^7.1.2",
+ "js-yaml": "^3.10.0",
+ "vinyl-file": "^3.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+ "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ }
+ },
+ "typescript": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+ "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
+ "dev": true
+ }
+ }
+ },
"@gitzone/tsrun": {
"version": "1.1.9",
"resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.9.tgz",
@@ -25,6 +74,79 @@
"typescript": "^2.9.1"
}
},
+ "@gitzone/tstest": {
+ "version": "1.0.13",
+ "resolved": "https://registry.npmjs.org/@gitzone/tstest/-/tstest-1.0.13.tgz",
+ "integrity": "sha512-nEdT3YJHrpkUVpum75n/ZU5voCjd7Fvq8gqbf47oaPC6r2LbqUhc6PnKo/YYaQLgXAaBtCTxFLZMUlWDg5fguw==",
+ "dev": true,
+ "requires": {
+ "@gitzone/tsrun": "^1.1.11",
+ "@pushrocks/consolecolor": "^2.0.1",
+ "@pushrocks/smartfile": "^6.0.6",
+ "@pushrocks/smartlog": "^2.0.1",
+ "@pushrocks/smartpromise": "^2.0.5",
+ "@pushrocks/smartshell": "^2.0.6",
+ "@types/figures": "^2.0.0",
+ "figures": "^2.0.0"
+ },
+ "dependencies": {
+ "@gitzone/tsrun": {
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.12.tgz",
+ "integrity": "sha512-DOxqOg+evoxhgbzhzH4u6LaPF+6bpMsnBVl1QQaHzKPGBlNjaIY4yJ0RsGnWMgX1hlNLvbgHtl0Ky4A2MDvyrg==",
+ "dev": true,
+ "requires": {
+ "@gitzone/tsbuild": "^2.0.22",
+ "@pushrocks/smartfile": "^6.0.6",
+ "ts-node": "^7.0.0",
+ "typescript": "^3.0.1"
+ }
+ },
+ "@pushrocks/smartfile": {
+ "version": "6.0.6",
+ "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.6.tgz",
+ "integrity": "sha512-vA1+yS6n0kuBZ+Bl30rxOCYvgIj0mo9g303cUpOZR0I781iQVWHcBKRC05FaGDxJD1HuYdvbSK+7vlrzZjVcMw==",
+ "dev": true,
+ "requires": {
+ "@pushrocks/smartpath": "^4.0.1",
+ "@pushrocks/smartpromise": "^2.0.5",
+ "@pushrocks/smartrequest": "^1.1.12",
+ "@types/fs-extra": "^5.0.4",
+ "@types/vinyl": "^2.0.2",
+ "fs-extra": "^7.0.0",
+ "glob": "^7.1.2",
+ "js-yaml": "^3.10.0",
+ "vinyl-file": "^3.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+ "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ }
+ },
+ "typescript": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+ "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
+ "dev": true
+ }
+ }
+ },
+ "@pushrocks/consolecolor": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@pushrocks/consolecolor/-/consolecolor-2.0.1.tgz",
+ "integrity": "sha512-iOFCHVeFZ2OywbdwSxVI4/wokkcLrXVdHLgvMmkNhJ220eeLgjNZWx3EJo3vNW3zq5ybCSCUIq0878djBxrWpw==",
+ "dev": true,
+ "requires": {
+ "ansi-256-colors": "^1.1.0"
+ }
+ },
"@pushrocks/smartdelay": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.1.tgz",
@@ -51,6 +173,27 @@
"vinyl-file": "^3.0.0"
}
},
+ "@pushrocks/smartlog": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@pushrocks/smartlog/-/smartlog-2.0.1.tgz",
+ "integrity": "sha512-GtsDTGIUF3VuWPyF8FV5dF31ZCEIcaJ56ZlvJsWxjnyJq57X25mk5/K0QAaRE9IIeHg6fORcukFomb5C+AOQrg==",
+ "dev": true,
+ "requires": {
+ "@pushrocks/smartlog-interfaces": "^1.0.9"
+ }
+ },
+ "@pushrocks/smartlog-interfaces": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.9.tgz",
+ "integrity": "sha512-0qwpomrRN0kFjmhR9m1iHYXoISoNuXtRP0Wr+JtkYyURLwKHMaW8Xoznf8MzXJptRfqufJi3Fxh5HodpPrIZUA==",
+ "dev": true
+ },
+ "@pushrocks/smartpath": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@pushrocks/smartpath/-/smartpath-4.0.1.tgz",
+ "integrity": "sha512-MaI0+uLQPCr2V3WGnbdgb0pWa9xkWyrP4qYcbsHIjeismGLbn9s3jmP/HIXU8LkgzRgaVb+BJxmZJHOwl32DyA==",
+ "dev": true
+ },
"@pushrocks/smartpromise": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
@@ -68,6 +211,17 @@
"form-data": "^2.3.2"
}
},
+ "@pushrocks/smartshell": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.6.tgz",
+ "integrity": "sha512-D48KB3DDqLfMjOXGEutqJi+v3Z4RcWacu5BJXxUwrecvd6oetbKobfmNGxeHSQPmNGb7U3ISfKwV6c5T5EZkJg==",
+ "dev": true,
+ "requires": {
+ "@pushrocks/smartpromise": "^2.0.5",
+ "@types/which": "^1.3.1",
+ "which": "^1.3.1"
+ }
+ },
"@pushrocks/tapbundle": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.1.tgz",
@@ -105,6 +259,12 @@
"@types/chai": "*"
}
},
+ "@types/figures": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@types/figures/-/figures-2.0.0.tgz",
+ "integrity": "sha512-mcRgJ+ncKuNI+Dwac7omO18B8C8u+YBS+AU/oyLhEyjAnT3cUUThhHgZpbiIvu5ZqSvdD30BXtrqg9nxc3OKMg==",
+ "dev": true
+ },
"@types/form-data": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
@@ -124,9 +284,9 @@
}
},
"@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==",
+ "version": "10.5.8",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.8.tgz",
+ "integrity": "sha512-sWSjw+bYW/2W+1V3m8tVsm9PKJcxk3NHN7oRqNUfEdofKg0Imbdu1dQbFvLKjZQXEDXRN6IfSMACjJ7Wv4NGCQ==",
"dev": true
},
"@types/vinyl": {
@@ -138,6 +298,12 @@
"@types/node": "*"
}
},
+ "@types/which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ==",
+ "dev": true
+ },
"ansi-256-colors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz",
@@ -371,12 +537,27 @@
"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
"dev": true
},
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "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
},
+ "figures": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "^1.0.5"
+ }
+ },
"first-chunk-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
@@ -530,6 +711,12 @@
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true
},
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "dev": true
+ },
"js-base64": {
"version": "2.4.8",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
@@ -931,6 +1118,15 @@
"vinyl": "^2.0.1"
}
},
+ "which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index d03db22..9c219cb 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": {
- "test": "tsrun test/test.base64.ts",
- "build": "(npmts)"
+ "test": "tstest test/",
+ "build": "(tstest)"
},
"repository": {
"type": "git",
@@ -24,8 +24,11 @@
},
"homepage": "https://gitlab.com/pushrocks/smartstring#readme",
"devDependencies": {
+ "@gitzone/tsbuild": "^2.0.22",
"@gitzone/tsrun": "^1.1.9",
- "@pushrocks/tapbundle": "^3.0.1"
+ "@gitzone/tstest": "^1.0.13",
+ "@pushrocks/tapbundle": "^3.0.1",
+ "@types/node": "^10.5.8"
},
"dependencies": {
"crypto-random-string": "^1.0.0",
diff --git a/test/test.typescript.ts b/test/test.typescript.ts
deleted file mode 100644
index 8a8c62c..0000000
--- a/test/test.typescript.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-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('/// ')).to.be.true;
-
- // tslint:disable-next-line:no-unused-expression
- expect(smartstring.typescript.regexReferencePath.test("/// ")).to.be.true;
-
- // tslint:disable-next-line:no-unused-expression
- expect(smartstring.typescript.regexReferencePath.test('/// ')).to.be.false;
-});
-
-tap.start();
diff --git a/ts/index.ts b/ts/index.ts
index 095e614..a7bb233 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -2,9 +2,8 @@ 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 { create, docker, typescript, normalize, indent };
+export { create, docker, normalize, indent };
export { Base64, base64 } from './smartstring.base64';
export { Domain } from './smartstring.domain';
diff --git a/ts/smartstring.plugins.ts b/ts/smartstring.plugins.ts
index 2d52b95..9f5f479 100644
--- a/ts/smartstring.plugins.ts
+++ b/ts/smartstring.plugins.ts
@@ -1,4 +1,3 @@
-import 'typings-global';
export let jsBase64 = require('js-base64').Base64;
export let stripIndent = require('strip-indent');
diff --git a/ts/smartstring.typescript.ts b/ts/smartstring.typescript.ts
deleted file mode 100644
index d87a967..0000000
--- a/ts/smartstring.typescript.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as plugins from './smartstring.plugins';
-
-export const regexReferencePath = /\/\/\/\s*\s*[\\n]?/;