1.0.58

.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
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,109 +18,115 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
-  - notpriv
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
 # ====================
-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 install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+    - docker
+
+testBuild:
   stage: test
   script:
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
+  only:
+    - tags
   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]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-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 +134,5 @@ pages:
   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:
-  - windows
+      - public
   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", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('./dist/index');
+const cliTool = require('./dist_ts/index');
+cliTool.runCli();

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
 require('@gitzone/tsrun');
-require('./ts/index');
+const cliTool = require('./ts/index');
+cliTool.runCli();

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,33 +1,55 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.8",
+  "version": "1.0.58",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
     "tstest": "./cli.js"
   },
   "scripts": {
-    "test": "(npm run prepareTest && npm run tstest && npm run cleanUp)",
+    "test": "(npm run cleanUp && npm run prepareTest && npm run tstest)",
     "prepareTest": "git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install",
-    "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/",
+    "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/ --web",
     "cleanUp": "rm -rf .nogit/sandbox-npmts",
-    "format": "(gitzone format)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.21",
-    "@pushrocks/tapbundle": "^3.0.1"
+    "@gitzone/tsbuild": "^2.1.27",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.1.9",
+    "@gitzone/tsbundle": "^1.0.87",
+    "@gitzone/tsrun": "^1.2.18",
     "@pushrocks/consolecolor": "^2.0.1",
-    "@pushrocks/smartfile": "^6.0.3",
-    "@pushrocks/smartlog": "^2.0.1",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartshell": "^2.0.5"
-  }
+    "@pushrocks/smartbrowser": "^1.0.17",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartexpress": "^3.0.107",
+    "@pushrocks/smartfile": "^8.0.10",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartshell": "^2.0.28",
+    "@pushrocks/tapbundle": "^3.2.14",
+    "@types/figures": "^3.0.1",
+    "figures": "^3.0.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

readme.md

@@ -0,0 +1,41 @@
+# @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). :)
+
+## 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/index.ts

@@ -1,9 +1,10 @@
 import { TsTest } from './tstest.classes.tstest';
 
-const cliRun = async () => {
-  if (process.env.CLI_CALL) {
-    const tsTestInstance = new TsTest(process.cwd(), process.argv[2]);
-    await tsTestInstance.run();
+export const runCli = async () => {
+  if (!process.argv[2]) {
+    console.error('You must specify a test directory as argument. Please try again.');
+    process.exit(1);
   }
+  const tsTestInstance = new TsTest(process.cwd(), process.argv[2]);
+  await tsTestInstance.run();
 };
-cliRun();

ts/tstest.classes.tap.combinator.ts

@@ -0,0 +1,65 @@
+// ============
+// combines different tap test files to an overall result
+// ============
+import * as plugins from './tstest.plugins';
+import { coloredString as cs } from '@pushrocks/consolecolor';
+
+import { TapParser } from './tstest.classes.tap.parser';
+import * as logPrefixes from './tstest.logprefixes';
+
+export class TapCombinator {
+  tapParserStore: TapParser[] = [];
+  addTapParser(tapParserArg: TapParser) {
+    this.tapParserStore.push(tapParserArg);
+  }
+
+  evaluate() {
+    console.log(
+      `${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.expectedTests) {
+        failGlobal = true;
+        let overviewString =
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
+          ` ${plugins.figures.pointer} ` +
+          `does not specify tests!`;
+        console.log(overviewString);
+      } else if (tapParser.expectedTests !== tapParser.receivedTests) {
+        failGlobal = true;
+        let overviewString =
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
+          ` ${plugins.figures.pointer} ` +
+          tapParser.getTestOverviewAsString() +
+          `did not execute all specified tests!`;
+        console.log(overviewString);
+      } else if (tapParser.getErrorTests().length === 0) {
+        let overviewString =
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') +
+          ` ${plugins.figures.pointer} ` +
+          tapParser.getTestOverviewAsString();
+        console.log(overviewString);
+      } else {
+        failGlobal = true;
+        let overviewString =
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
+          ` ${plugins.figures.pointer} ` +
+          tapParser.getTestOverviewAsString();
+        console.log(overviewString);
+      }
+    }
+    console.log(cs(plugins.figures.hamburger.repeat(48), 'cyan'));
+    if (!failGlobal) {
+      console.log(cs('FINAL RESULT: SUCCESS!', 'green'));
+    } else {
+      console.log(cs('FINAL RESULT: FAIL!', 'red'));
+      process.exit(1);
+    }
+  }
+}

ts/tstest.classes.tap.parser.ts

@@ -0,0 +1,202 @@
+import { ChildProcess } from 'child_process';
+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.classes.tap.testresult';
+import * as logPrefixes from './tstest.logprefixes';
+
+export class TapParser {
+  testStore: TapTestResult[] = [];
+
+  expectedTestsRegex = /([0-9]*)\.\.([0-9]*)$/;
+  expectedTests: number;
+  receivedTests: number;
+
+  testStatusRegex = /(ok|not\sok)\s([0-9]+)\s-\s(.*)\s#\stime=(.*)ms$/;
+  activeTapTestResult: TapTestResult;
+
+  /**
+   * the constructor for TapParser
+   */
+  constructor(public fileName: string) {}
+
+  private _getNewTapTestResult() {
+    this.activeTapTestResult = new TapTestResult(this.testStore.length + 1);
+  }
+
+  private _processLog(logChunk: Buffer | string) {
+    if (Buffer.isBuffer(logChunk)) {
+      logChunk = logChunk.toString();
+    }
+    const logLineArray = logChunk.split('\n');
+    if (logLineArray[logLineArray.length - 1] === '') {
+      logLineArray.pop();
+    }
+
+    // lets parse the log information
+    for (const logLine of logLineArray) {
+      let logLineIsTapProtocol = false;
+      if (!this.expectedTests && this.expectedTestsRegex.test(logLine)) {
+        logLineIsTapProtocol = true;
+        const regexResult = this.expectedTestsRegex.exec(logLine);
+        this.expectedTests = parseInt(regexResult[2]);
+        console.log(
+          `${logPrefixes.TapPrefix} ${cs(`Expecting ${this.expectedTests} tests!`, 'blue')}`
+        );
+
+        // initiating first TapResult
+        this._getNewTapTestResult();
+      } else if (this.testStatusRegex.test(logLine)) {
+        logLineIsTapProtocol = true;
+        const regexResult = this.testStatusRegex.exec(logLine);
+        const testId = parseInt(regexResult[2]);
+        const testOk = (() => {
+          if (regexResult[1] === 'ok') {
+            return true;
+          }
+          return false;
+        })();
+
+        const testSubject = regexResult[3];
+        const testDuration = parseInt(regexResult[4]);
+
+        // test for protocol error
+        if (testId !== this.activeTapTestResult.id) {
+          console.log(
+            `${logPrefixes.TapErrorPrefix} Something is strange! Test Ids are not equal!`
+          );
+        }
+        this.activeTapTestResult.setTestResult(testOk);
+
+        if (testOk) {
+          console.log(
+            logPrefixes.TapPrefix,
+            `${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')} ${plugins.figures.arrowRight} ` +
+              cs(testSubject, 'blue') +
+              ` | ${cs(`${testDuration} ms`, 'orange')}`
+          );
+        }
+      }
+
+      if (!logLineIsTapProtocol) {
+        if (this.activeTapTestResult) {
+          this.activeTapTestResult.addLogLine(logLine);
+        }
+        console.log(logLine);
+      }
+
+      if (this.activeTapTestResult && this.activeTapTestResult.testSettled) {
+        this.testStore.push(this.activeTapTestResult);
+        this._getNewTapTestResult();
+      }
+    }
+  }
+
+  /**
+   * returns all tests that are not completed
+   */
+  public getUncompletedTests() {
+    // TODO:
+  }
+
+  /**
+   * returns all tests that threw an error
+   */
+  public getErrorTests() {
+    return this.testStore.filter((tapTestArg) => {
+      return !tapTestArg.testOk;
+    });
+  }
+
+  /**
+   * returns a test overview as string
+   */
+  getTestOverviewAsString() {
+    let overviewString = '';
+    for (const 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
+   */
+  public async handleTapProcess(childProcessArg: ChildProcess) {
+    const done = plugins.smartpromise.defer();
+    childProcessArg.stdout.on('data', (data) => {
+      this._processLog(data);
+    });
+    childProcessArg.stderr.on('data', (data) => {
+      this._processLog(data);
+    });
+    childProcessArg.on('exit', async () => {
+      await this._evaluateResult();
+      done.resolve();
+    });
+    await done.promise;
+  }
+
+  public async handleTapLog(tapLog: string) {
+    this._processLog(tapLog);
+    await this._evaluateResult();
+  }
+
+  private async _evaluateResult() {
+    this.receivedTests = this.testStore.length;
+
+    // check wether all tests ran
+    if (this.expectedTests === this.receivedTests) {
+      console.log(
+        `${logPrefixes.TapPrefix} ${cs(
+          `${this.receivedTests} out of ${this.expectedTests} Tests completed!`,
+          'green'
+        )}`
+      );
+    } else {
+      console.log(
+        `${logPrefixes.TapErrorPrefix} ${cs(
+          `Only ${this.receivedTests} out of ${this.expectedTests} completed!`,
+          'red'
+        )}`
+      );
+    }
+    if (!this.expectedTests) {
+      console.log(cs('Error: No tests were defined. Therefore the testfile failed!', 'red'));
+    } else if (this.expectedTests !== this.receivedTests) {
+      console.log(
+        cs(
+          'Error: The amount of received tests and expectedTests is unequal! Therefore the testfile failed',
+          'red'
+        )
+      );
+    } else if (this.getErrorTests().length === 0) {
+      console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`);
+    } else {
+      console.log(
+        `${logPrefixes.TapPrefix} ${cs(
+          `${this.getErrorTests().length} tests threw an error!!!`,
+          'red'
+        )}`
+      );
+    }
+  }
+}

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 { TapParser } from './tstest.tap.parser';
-import { TapTestResult } from './tstest.tap.testresult';
+import { TapCombinator } from './tstest.classes.tap.combinator';
+import { TapParser } from './tstest.classes.tap.parser';
+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

@@ -1,13 +1,24 @@
 import * as plugins from './tstest.plugins';
 import * as paths from './tstest.paths';
+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 { TapParser } from './tstest.tap.parser';
+import { TapCombinator } from './tstest.classes.tap.combinator';
+import { TapParser } from './tstest.classes.tap.parser';
 
 export class TsTest {
-  testDir: TestDirectory;
+  public testDir: TestDirectory;
+
+  public smartshellInstance = new plugins.smartshell.Smartshell({
+    executor: 'bash',
+    pathDirectories: [paths.binDirectory],
+    sourceFilePaths: [],
+  });
+  public smartbrowserInstance = new plugins.smartbrowser.SmartBrowser();
+
+  public tsbundleInstance = new plugins.tsbundle.TsBundle();
 
   constructor(cwdArg: string, relativePathToTestDirectory: string) {
     this.testDir = new TestDirectory(cwdArg, relativePathToTestDirectory);
@@ -15,28 +26,200 @@ export class TsTest {
 
   async run() {
     const fileNamesToRun: string[] = await this.testDir.getTestFilePathArray();
-    console.log(`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(cs(fileName, 'orange'));
+      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',
-      pathDirectories: [paths.binDirectory],
-      sourceFilePaths: []
-    });
+
     const tapCombinator = new TapCombinator(); // lets create the TapCombinator
-    for (const fileName of fileNamesToRun) {
-      console.log(`${cs('=> ', 'blue')} Running ${cs(fileName, 'orange')}`);
-      console.log(cs(`=`.repeat(16), 'cyan'));
-      const tapParser = new TapParser();
-      const execResultStreaming = await smartshellInstance.execStreamingSilent(`tsrun ${fileName}`);
-      await tapParser.handleTapProcess(execResultStreaming.childProcess);
+    for (const fileNameArg of fileNamesToRun) {
+      switch (true) {
+        case process.env.CI && fileNameArg.includes('.nonci.'):
+          console.log('!!!!!!!!!!!');
+          console.log(
+            `not running testfile ${fileNameArg}, sinc we are CI and file name includes '.nonci.' tag`
+          );
+          console.log('!!!!!!!!!!!');
+          break;
+        case fileNameArg.endsWith('.browser.ts'):
+          const tapParserBrowser = await this.runInChrome(fileNameArg);
+          tapCombinator.addTapParser(tapParserBrowser);
+          break;
+        case fileNameArg.endsWith('.both.ts'):
+          console.log('>>>>>>> TEST PART 1: chrome');
+          const tapParserBothBrowser = await this.runInChrome(fileNameArg);
+          tapCombinator.addTapParser(tapParserBothBrowser);
+          console.log(cs(`|`.repeat(16), 'cyan'));
+          console.log(''); // force new line
+          console.log('>>>>>>> TEST PART 2: node');
+          const tapParserBothNode = await this.runInNode(fileNameArg);
+          tapCombinator.addTapParser(tapParserBothNode);
+          break;
+        default:
+          const tapParserNode = await this.runInNode(fileNameArg);
+          tapCombinator.addTapParser(tapParserNode);
+          break;
+      }
+
       console.log(cs(`^`.repeat(16), 'cyan'));
       console.log(''); // force new line
-      tapCombinator.addTapParser(tapParser);
     }
     tapCombinator.evaluate();
   }
+
+  public async runInNode(fileNameArg: string): Promise<TapParser> {
+    console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in node.js runtime.`);
+    console.log(`${cs(`= `.repeat(32), 'cyan')}`);
+    const tapParser = new TapParser(fileNameArg + ':node');
+
+    // tsrun options
+    let tsrunOptions = '';
+    if (process.argv.includes('--web')) {
+      tsrunOptions += ' --web';
+    }
+
+    const execResultStreaming = await this.smartshellInstance.execStreamingSilent(
+      `tsrun ${fileNameArg}${tsrunOptions}`
+    );
+    await tapParser.handleTapProcess(execResultStreaming.childProcess);
+    return tapParser;
+  }
+
+  public async runInChrome(fileNameArg: string): Promise<TapParser> {
+    console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in chromium runtime.`);
+    console.log(`${cs(`= `.repeat(32), 'cyan')}`);
+
+    // lets get all our paths sorted
+    const tsbundleCacheDirPath = plugins.path.join(paths.cwd, './.nogit/tstest_cache');
+    const bundleFileName = fileNameArg.replace('/', '__') + '.js';
+    const bundleFilePath = plugins.path.join(tsbundleCacheDirPath, bundleFileName);
+
+    // lets bundle the test
+    await plugins.smartfile.fs.ensureDir(tsbundleCacheDirPath);
+    await this.tsbundleInstance.buildTest(process.cwd(), fileNameArg, bundleFilePath, 'parcel');
+
+    // lets create a server
+    const server = new plugins.smartexpress.Server({
+      cors: true,
+      port: 3007,
+    });
+    server.addRoute(
+      '/test',
+      new plugins.smartexpress.Handler('GET', async (req, res) => {
+        res.type('.html');
+        res.write(`
+        <html>
+          <head>
+            <script>
+              globalThis.testdom = true;
+            </script>
+          </head>
+          <body></body>
+        </html>
+      `);
+        res.end();
+      })
+    );
+    server.addRoute('*', new plugins.smartexpress.HandlerStatic(tsbundleCacheDirPath));
+    await server.start();
+
+    // lets do the browser bit
+    await this.smartbrowserInstance.start();
+    const evaluation = await this.smartbrowserInstance.evaluateOnPage(
+      `http://localhost:3007/test?bundleName=${bundleFileName}`,
+      async () => {
+        const convertToText = (obj: any): string => {
+          // create an array that will later be joined into a string.
+          const stringArray = [];
+
+          if (typeof obj === 'object' && typeof obj.toString === 'function') {
+            stringArray.push(obj.toString());
+          } else if (typeof obj === 'object' && obj.join === undefined) {
+            stringArray.push('{');
+            for (const prop of Object.keys(obj)) {
+              stringArray.push(prop, ': ', convertToText(obj[prop]), ',');
+            }
+            stringArray.push('}');
+
+            // is array
+          } else if (typeof obj === 'object' && !(obj.join === undefined)) {
+            stringArray.push('[');
+            for (const prop of Object.keys(obj)) {
+              stringArray.push(convertToText(obj[prop]), ',');
+            }
+            stringArray.push(']');
+
+            // is function
+          } else if (typeof obj === 'function') {
+            stringArray.push(obj.toString());
+
+            // all other values can be done with JSON.stringify
+          } else {
+            stringArray.push(JSON.stringify(obj));
+          }
+
+          return stringArray.join('');
+        };
+
+        let logStore = '';
+        // tslint:disable-next-line: max-classes-per-file
+        const log = console.log.bind(console);
+        console.log = (...args) => {
+          args = args.map((argument) => {
+            return typeof argument !== 'string' ? convertToText(argument) : argument;
+          });
+          logStore += `${args}\n`;
+          log(...args);
+        };
+        const error = console.error;
+        console.error = (...args) => {
+          args = args.map((argument) => {
+            return typeof argument !== 'string' ? convertToText(argument) : argument;
+          });
+          logStore += `${args}\n`;
+          error(...args);
+        };
+        const bundleName = new URLSearchParams(window.location.search).get('bundleName');
+        console.log(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`);
+        const bundleResponse = await fetch(`/${bundleName}`);
+        console.log(
+          `::TSTEST IN CHROMIUM:: Got ${bundleName} with STATUS ${bundleResponse.status}`
+        );
+        const bundle = await bundleResponse.text();
+        console.log(`::TSTEST IN CHROMIUM:: Executing ${bundleName}`);
+        try {
+          // tslint:disable-next-line: no-eval
+          eval(bundle);
+        } catch (err) {
+          console.error(err);
+        }
+
+        if (
+          (globalThis as any).tapbundleDeferred &&
+          (globalThis as any).tapbundleDeferred.promise
+        ) {
+          await (globalThis as any).tapbundleDeferred.promise;
+        } else {
+          console.log('Error: Could not find tapbundle Deferred');
+        }
+        return logStore;
+      }
+    );
+    await this.smartbrowserInstance.stop();
+    await server.stop();
+    console.log(
+      `${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance and server.`
+    );
+    console.log(`${cs('=> ', 'blue')} See the result captured from the chromium execution:`);
+    // lets create the tap parser
+    const tapParser = new TapParser(fileNameArg + ':chrome');
+    tapParser.handleTapLog(evaluation);
+    return tapParser;
+  }
+
+  public async runInDeno() {}
 }

ts/tstest.logprefixes.ts

@@ -1,3 +1,7 @@
 import * as plugins from './tstest.plugins';
+import { coloredString as cs } from '@pushrocks/consolecolor';
 
-export const TapPrefix = plugins.consolecolor.coloredString(`:::TAP:::`, 'green', 'black');
+export const TapPrefix = cs(`::TAP::`, 'pink', 'black');
+export const TapErrorPrefix = cs(` !!!TAP PROTOCOL ERROR!!! `, 'red', 'black');
+
+export const TsTestPrefix = cs(`**TSTEST**`, 'pink', 'black');

ts/tstest.plugins.ts

@@ -1,11 +1,37 @@
 // node native
 import * as path from 'path';
 
+export { path };
+
 // @pushrocks scope
 import * as consolecolor from '@pushrocks/consolecolor';
+import * as smartbrowser from '@pushrocks/smartbrowser';
+import * as smartexpress from '@pushrocks/smartexpress';
+import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartlog from '@pushrocks/smartlog';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartshell from '@pushrocks/smartshell';
+import * as tapbundle from '@pushrocks/tapbundle';
 
-export { consolecolor, path, smartfile, smartlog, smartpromise, smartshell };
+export {
+  consolecolor,
+  smartbrowser,
+  smartexpress,
+  smartdelay,
+  smartfile,
+  smartlog,
+  smartpromise,
+  smartshell,
+  tapbundle,
+};
+
+// @gitzone scope
+import * as tsbundle from '@gitzone/tsbundle';
+
+export { tsbundle };
+
+// sindresorhus
+import * as figures from 'figures';
+
+export { figures };

ts/tstest.tap.combinator.ts

@@ -1,20 +0,0 @@
-// ============
-// combines different tap test files to an overall result
-// ============
-import * as plugins from './tstest.plugins';
-import { coloredString as cs } from '@pushrocks/consolecolor';
-
-import { TapParser } from './tstest.tap.parser';
-
-export class TapCombinator {
-  tapParserStore: TapParser[] = [];
-  addTapParser(tapParserArg: TapParser) {
-    this.tapParserStore.push(tapParserArg);
-  }
-
-  evaluate() {
-    console.log(`Ran ${this.tapParserStore.length} Testfiles!`);
-    for (const tapParser of this.tapParserStore) {
-    }
-  }
-}

ts/tstest.tap.parser.ts

@@ -1,108 +0,0 @@
-import { ChildProcess } from 'child_process';
-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 * as logPrefixes from './tstest.logprefixes';
-
-export class TapParser {
-  resultStore: TapTestResult[] = [];
-
-  expectedTestsRegex = /([0-9]*)\.\.([0-9]*)/;
-  expectedTests: number;
-
-  testStatusRegex = /(ok|not\sok)\s([0-9]+)\s-\s(.*)\s#\stime=(.*)ms$/;
-  activeTapTestResult: TapTestResult;
-
-  private _getNewTapTestResult() {
-    this.activeTapTestResult = new TapTestResult(this.resultStore.length + 1);
-  }
-
-  private _processLog(logChunk: Buffer | string) {
-    if (Buffer.isBuffer(logChunk)) {
-      logChunk = logChunk.toString();
-    }
-    const logLineArray = logChunk.split('\n');
-    if (logLineArray[logLineArray.length - 1] === '') {
-      logLineArray.pop();
-    }
-
-    // lets parse the log information
-    for (const logLine of logLineArray) {
-      let logLineIsTapProtocol = false;
-      if (!this.expectedTests && this.expectedTestsRegex.test(logLine)) {
-        logLineIsTapProtocol = true;
-        const regexResult = this.expectedTestsRegex.exec(logLine);
-        this.expectedTests = parseInt(regexResult[2]);
-        console.log(`:::TAP::: Expecting ${this.expectedTests} tests!`);
-
-        // initiating first TapResult
-        this._getNewTapTestResult();
-      } else if (this.testStatusRegex.test(logLine)) {
-        logLineIsTapProtocol = true;
-        const regexResult = this.testStatusRegex.exec(logLine);
-        const testId = parseInt(regexResult[2]);
-        const testOk = (() => {
-          if (regexResult[1] === 'ok') {
-            return true;
-          }
-          return false;
-        })();
-
-        const testSubject = regexResult[3];
-        const testDuration = parseInt(regexResult[4]);
-
-        // test for protocol error
-        if (testId !== this.activeTapTestResult.id) {
-          console.log(`:::TAP PROTOCOL ERROR::: Something is strange! Test Ids are not equal!`);
-        }
-        this.activeTapTestResult.setTestResult(testOk);
-
-        if (testOk) {
-          console.log(
-            logPrefixes.TapPrefix,
-            ` ${cs(`Test ${testId} -> Success!`, 'green')} | ` +
-            cs(testSubject, 'blue') +
-            ` | ${cs(`${testDuration} milliseconds`, 'orange')}`
-          );
-        } else {
-          console.log(
-            logPrefixes.TapPrefix,
-            ` ${cs(`Test ${testId} -> Error!`, 'red')} | ` +
-            cs(testSubject, 'blue') +
-            ` | ${cs(`${testDuration} milliseconds`, 'orange')}`
-          );
-        }
-      }
-
-      if (!logLineIsTapProtocol) {
-        if (this.activeTapTestResult) {
-          this.activeTapTestResult.addLogLine(logLine);
-        }
-        console.log(logLine);
-      }
-
-      if (this.activeTapTestResult && this.activeTapTestResult.testSettled) {
-        this.resultStore.push(this.activeTapTestResult);
-        this._getNewTapTestResult();
-      }
-    }
-  }
-
-  async handleTapProcess(childProcessArg: ChildProcess) {
-    const done = plugins.smartpromise.defer();
-    childProcessArg.stdout.on('data', data => {
-      this._processLog(data);
-    });
-    childProcessArg.stderr.on('data', data => {
-      this._processLog(data);
-    });
-    childProcessArg.on('exit', () => {
-      done.resolve();
-    });
-    await done.promise;
-  }
-}

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"
 }