1.0.31

.gitignore

@@ -1,6 +1,20 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
 .yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,109 +18,104 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci command npm install -g snyk
+    - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci node install lts
+    - npmci npm prepare
-  - npmci npm install
+    - npmci node install stable
-  - npmci npm test
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
-    
+    - priv
-testSTABLE:
+
+testBuild:
   stage: test
   script:
-  - npmci node install stable
+    - npmci npm prepare
-  - npmci npm install
+    - npmci node install stable
-  - npmci npm test
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - 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/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --volume "$PWD":/code
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --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
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -128,15 +123,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - 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:
-  - windows
   allow_failure: true

.vscode/launch.json

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

.vscode/settings.json

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

contribute.md

@@ -0,0 +1,3 @@
+# How to contribute
+
+Start with `tstest.classes.tstest.ts` to understand whats happening

npmextra.json

@@ -2,5 +2,16 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "gitzone",
+      "gitrepo": "tstest",
+      "shortDescription": "a test utility to run tests that match test/**/*.ts",
+      "npmPackagename": "@gitzone/tstest",
+      "license": "MIT"
+    }
   }
-}
+}

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.13",
+  "version": "1.0.31",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
@@ -19,17 +19,30 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.21",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@pushrocks/tapbundle": "^3.0.1"
+    "@pushrocks/tapbundle": "^3.0.13"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.1.11",
+    "@gitzone/tsbundle": "^1.0.69",
+    "@gitzone/tsrun": "^1.2.12",
     "@pushrocks/consolecolor": "^2.0.1",
-    "@pushrocks/smartfile": "^6.0.6",
+    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartlog": "^2.0.1",
+    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartshell": "^2.0.6",
+    "@pushrocks/smartshell": "^2.0.25",
-    "@types/figures": "^2.0.0",
+    "@types/figures": "^3.0.1",
-    "figures": "^2.0.0"
+    "figures": "^3.0.0"
-  }
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,38 @@
+# @gitzone/tstest
+a test utility to run tests that match test/**/*.ts
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tstest)
+* [gitlab.com (source)](https://gitlab.com/gitzone/tstest)
+* [github.com (source mirror)](https://github.com/gitzone/tstest)
+* [docs (typedoc)](https://gitzone.gitlab.io/tstest/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/gitzone/tstest/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/gitzone/tstest/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@gitzone/tstest)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/gitzone/tstest)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tstest)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tstest)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tstest)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
+
+## Usage
+
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/tstest.classes.tap.combinator.ts

@@ -4,7 +4,7 @@
 import * as plugins from './tstest.plugins';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
-import { TapParser } from './tstest.tap.parser';
+import { TapParser } from './tstest.classes.tap.parser';
 import * as logPrefixes from './tstest.logprefixes';
 
 export class TapCombinator {
@@ -14,35 +14,35 @@ export class TapCombinator {
   }
 
   evaluate() {
-    console.log(`${logPrefixes.TsTestPrefix} Ran ${this.tapParserStore.length} Testfiles!`);
+    console.log(
-    console.log(`${logPrefixes.TsTestPrefix} Here are the overall results:`);
+      `${logPrefixes.TsTestPrefix} RESULTS FOR ${this.tapParserStore.length} TESTFILE(S):`
-    
+    );
+
     let failGlobal = false; // determine wether tstest should fail
     for (const tapParser of this.tapParserStore) {
-      if(tapParser.getErrorTests().length === 0) {
+      if (tapParser.getErrorTests().length === 0) {
-        console.log(
+        let overviewString =
           logPrefixes.TsTestPrefix +
           cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') +
-          ' | ' +
+          ` ${plugins.figures.pointer} ` +
-          cs(` all tests completed successfully!`, 'blue')
+          tapParser.getTestOverviewAsString();
-        )
+        console.log(overviewString);
       } else {
-        console.log(
+        let overviewString =
           logPrefixes.TsTestPrefix +
           cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
-          ' | ' +
+          ` ${plugins.figures.pointer} ` +
-          cs(` Errors ocurred, please check for the logs!`, 'blue')
+          tapParser.getTestOverviewAsString();
-        );
+        console.log(overviewString);
         failGlobal = true;
       }
     }
-    console.log(cs('-'.repeat(16), 'cyan'));
+    console.log(cs(plugins.figures.hamburger.repeat(48), 'cyan'));
-    console.log(cs('*'.repeat(16), 'cyan'));
+    if (!failGlobal) {
-    console.log(cs('-'.repeat(16), 'cyan'));
+      console.log(cs('FINAL RESULT: SUCCESS!', 'green'));
-    if(!failGlobal) {
-      console.log(cs('Ending with code 0: TESTS ARE PASSING!', 'green'));
     } else {
-      console.log(cs('Ending with code 1: TESTS ARE FAILING!', 'red'));
+      console.log(cs('FINAL RESULT: FAIL!', 'red'));
+      process.exit(1);
     }
   }
 }

ts/tstest.classes.tap.parser.ts

@@ -5,13 +5,13 @@ import { coloredString as cs } from '@pushrocks/consolecolor';
 // combines different tap test files to an overall result
 // ============
 import * as plugins from './tstest.plugins';
-import { TapTestResult } from './tstest.tap.testresult';
+import { TapTestResult } from './tstest.classes.tap.testresult';
 import * as logPrefixes from './tstest.logprefixes';
 
 export class TapParser {
   testStore: TapTestResult[] = [];
 
-  expectedTestsRegex = /([0-9]*)\.\.([0-9]*)/;
+  expectedTestsRegex = /([0-9]*)\.\.([0-9]*)$/;
   expectedTests: number;
   receivedTests: number;
 
@@ -23,7 +23,6 @@ export class TapParser {
    */
   constructor(public fileName: string) {}
 
-
   private _getNewTapTestResult() {
     this.activeTapTestResult = new TapTestResult(this.testStore.length + 1);
   }
@@ -45,10 +44,7 @@ export class TapParser {
         const regexResult = this.expectedTestsRegex.exec(logLine);
         this.expectedTests = parseInt(regexResult[2]);
         console.log(
-          `${logPrefixes.TapPrefix} ${cs(
+          `${logPrefixes.TapPrefix} ${cs(`Expecting ${this.expectedTests} tests!`, 'blue')}`
-            `Expecting ${this.expectedTests} tests!`,
-            'blue'
-          )}`
         );
 
         // initiating first TapResult
@@ -70,9 +66,7 @@ export class TapParser {
         // test for protocol error
         if (testId !== this.activeTapTestResult.id) {
           console.log(
-            `${
+            `${logPrefixes.TapErrorPrefix} Something is strange! Test Ids are not equal!`
-              logPrefixes.TapErrorPrefix
-            } Something is strange! Test Ids are not equal!`
           );
         }
         this.activeTapTestResult.setTestResult(testOk);
@@ -80,14 +74,14 @@ export class TapParser {
         if (testOk) {
           console.log(
             logPrefixes.TapPrefix,
-            `${cs(`T${testId} ${plugins.figures.tick}`, 'green')} | ` +
+            `${cs(`T${testId} ${plugins.figures.tick}`, 'green')} ${plugins.figures.arrowRight} ` +
               cs(testSubject, 'blue') +
               ` | ${cs(`${testDuration} ms`, 'orange')}`
           );
         } else {
           console.log(
             logPrefixes.TapPrefix,
-            `${cs(`T${testId} ${plugins.figures.cross}`, 'red')} | ` +
+            `${cs(`T${testId} ${plugins.figures.cross}`, 'red')} ${plugins.figures.arrowRight} ` +
               cs(testSubject, 'blue') +
               ` | ${cs(`${testDuration} ms`, 'orange')}`
           );
@@ -124,6 +118,28 @@ export class TapParser {
     });
   }
 
+  /**
+   * returns a test overview as string
+   */
+  getTestOverviewAsString() {
+    let overviewString = '';
+    for (let test of this.testStore) {
+      if (overviewString !== '') {
+        overviewString += ' | ';
+      }
+      if (test.testOk) {
+        overviewString += cs(`T${test.id} ${plugins.figures.tick}`, 'green');
+      } else {
+        overviewString += cs(`T${test.id} ${plugins.figures.cross}`, 'red');
+      }
+    }
+    return overviewString;
+  }
+
+  /**
+   * handles a tap process
+   * @param childProcessArg
+   */
   async handleTapProcess(childProcessArg: ChildProcess) {
     const done = plugins.smartpromise.defer();
     childProcessArg.stdout.on('data', data => {
@@ -139,29 +155,20 @@ export class TapParser {
       if (this.expectedTests === this.receivedTests) {
         console.log(
           `${logPrefixes.TapPrefix} ${cs(
-            `${this.receivedTests} out of ${
+            `${this.receivedTests} out of ${this.expectedTests} Tests completed!`,
-              this.expectedTests
-            } Tests completed!`,
             'green'
           )}`
         );
       } else {
         console.log(
           `${logPrefixes.TapErrorPrefix} ${cs(
-            `Only ${this.receivedTests} out of ${
+            `Only ${this.receivedTests} out of ${this.expectedTests} completed!`,
-              this.expectedTests
-            } completed!`,
             'red'
           )}`
         );
       }
       if (this.getErrorTests().length === 0) {
-        console.log(
+        console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`);
-          `${logPrefixes.TapPrefix} ${cs(
-            `All tests are successfull!!!`,
-            'green'
-          )}`
-        );
       } else {
         console.log(
           `${logPrefixes.TapPrefix} ${cs(

ts/tstest.classes.testdirectory.ts

@@ -3,9 +3,9 @@ import * as paths from './tstest.paths';
 import { Smartfile } from '@pushrocks/smartfile';
 
 // tap related stuff
-import { TapCombinator } from './tstest.tap.combinator';
+import { TapCombinator } from './tstest.classes.tap.combinator';
-import { TapParser } from './tstest.tap.parser';
+import { TapParser } from './tstest.classes.tap.parser';
-import { TapTestResult } from './tstest.tap.testresult';
+import { TapTestResult } from './tstest.classes.tap.testresult';
 
 export class TestDirectory {
   /**
@@ -41,7 +41,7 @@ export class TestDirectory {
   private async _init() {
     this.testfileArray = await plugins.smartfile.fs.fileTreeToObject(
       plugins.path.join(this.cwd, this.relativePath),
-      '**/*.ts'
+      'test*.ts'
     );
   }
 

ts/tstest.classes.tstest.ts

@@ -5,8 +5,8 @@ import * as logPrefixes from './tstest.logprefixes';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
 import { TestDirectory } from './tstest.classes.testdirectory';
-import { TapCombinator } from './tstest.tap.combinator';
+import { TapCombinator } from './tstest.classes.tap.combinator';
-import { TapParser } from './tstest.tap.parser';
+import { TapParser } from './tstest.classes.tap.parser';
 
 export class TsTest {
   testDir: TestDirectory;
@@ -17,11 +17,13 @@ export class TsTest {
 
   async run() {
     const fileNamesToRun: string[] = await this.testDir.getTestFilePathArray();
-    console.log(`${logPrefixes.TsTestPrefix} Found ${fileNamesToRun.length} Testfile(s):`);
+    console.log(cs(plugins.figures.hamburger.repeat(80), 'cyan'));
+    console.log('');
+    console.log(`${logPrefixes.TsTestPrefix} FOUND ${fileNamesToRun.length} TESTFILE(S):`);
     for (const fileName of fileNamesToRun) {
       console.log(`${logPrefixes.TsTestPrefix} ${cs(fileName, 'orange')}`);
     }
-    console.log('-'.repeat(16));
+    console.log('-'.repeat(48));
     console.log(''); // force new line
     const smartshellInstance = new plugins.smartshell.Smartshell({
       executor: 'bash',
@@ -33,7 +35,16 @@ export class TsTest {
       console.log(`${cs('=> ', 'blue')} Running ${cs(fileName, 'orange')}`);
       console.log(cs(`=`.repeat(16), 'cyan'));
       const tapParser = new TapParser(fileName);
-      const execResultStreaming = await smartshellInstance.execStreamingSilent(`tsrun ${fileName}`);
+
+      // tsrun options
+      let tsrunOptions = '';
+      if (process.argv.includes('--web')) {
+        tsrunOptions += ' --web';
+      }
+
+      const execResultStreaming = await smartshellInstance.execStreamingSilent(
+        `tsrun ${fileName}${tsrunOptions}`
+      );
       await tapParser.handleTapProcess(execResultStreaming.childProcess);
       console.log(cs(`^`.repeat(16), 'cyan'));
       console.log(''); // force new line

tslint.json

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