1.0.35

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();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.30",
+  "version": "1.0.35",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
@@ -11,21 +11,25 @@
     "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 --web)"
-    "build": "(tsbuild)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
-    "@pushrocks/tapbundle": "^3.0.13"
+    "@pushrocks/tapbundle": "^3.0.13",
+    "tslint": "^6.1.2",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.69",
+    "@gitzone/tsbundle": "^1.0.72",
-    "@gitzone/tsrun": "^1.2.10",
+    "@gitzone/tsrun": "^1.2.12",
     "@pushrocks/consolecolor": "^2.0.1",
+    "@pushrocks/smartbrowser": "^1.0.17",
+    "@pushrocks/smartdelay": "^2.0.9",
+    "@pushrocks/smartexpress": "^3.0.73",
     "@pushrocks/smartfile": "^7.0.6",
     "@pushrocks/smartlog": "^2.0.19",
     "@pushrocks/smartpromise": "^3.0.6",

ts/index.ts

@@ -1,9 +1,6 @@
 import { TsTest } from './tstest.classes.tstest';
 
-const cliRun = async () => {
+export const runCli = async () => {
-  if (process.env.CLI_CALL) {
+  const tsTestInstance = new TsTest(process.cwd(), process.argv[2]);
-    const tsTestInstance = new TsTest(process.cwd(), process.argv[2]);
+  await tsTestInstance.run();
-    await tsTestInstance.run();
-  }
 };
-cliRun();

ts/tstest.classes.tap.parser.ts

@@ -105,14 +105,14 @@ export class TapParser {
   /**
    * returns all tests that are not completed
    */
-  getUncompletedTests() {
+  public getUncompletedTests() {
     // TODO:
   }
 
   /**
    * returns all tests that threw an error
    */
-  getErrorTests() {
+  public getErrorTests() {
     return this.testStore.filter(tapTestArg => {
       return !tapTestArg.testOk;
     });
@@ -123,7 +123,7 @@ export class TapParser {
    */
   getTestOverviewAsString() {
     let overviewString = '';
-    for (let test of this.testStore) {
+    for (const test of this.testStore) {
       if (overviewString !== '') {
         overviewString += ' | ';
       }
@@ -181,4 +181,8 @@ export class TapParser {
     });
     await done.promise;
   }
+
+  public handleTapLog(tapLog: string) {
+    this._processLog(tapLog);
+  }
 }

ts/tstest.classes.tstest.ts

@@ -7,9 +7,19 @@ import { coloredString as cs } from '@pushrocks/consolecolor';
 import { TestDirectory } from './tstest.classes.testdirectory';
 import { TapCombinator } from './tstest.classes.tap.combinator';
 import { TapParser } from './tstest.classes.tap.parser';
+import { threeEighths } from 'figures';
 
 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);
@@ -25,31 +35,193 @@ export class TsTest {
     }
     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) {
+    for (const fileNameArg of fileNamesToRun) {
-      console.log(`${cs('=> ', 'blue')} Running ${cs(fileName, 'orange')}`);
+      let tapParser: TapParser;
-      console.log(cs(`=`.repeat(16), 'cyan'));
+      switch (true) {
-      const tapParser = new TapParser(fileName);
+        case fileNameArg.endsWith('.browser.ts'):
-
+          tapParser = await this.runInChrome(fileNameArg);
-      // tsrun options
+          break;
-      let tsrunOptions = '';
+        default:
-      if (process.argv.includes('--web')) {
+          tapParser = await this.runInNode(fileNameArg);
-        tsrunOptions += ' --web';
+          break;
       }
-
-      const execResultStreaming = await smartshellInstance.execStreamingSilent(
-        `tsrun ${fileName}${tsrunOptions}`
-      );
-      await tapParser.handleTapProcess(execResultStreaming.childProcess);
-      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(16), 'cyan'));
+    const tapParser = new TapParser(fileNameArg);
+
+    // 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);
+    console.log(cs(`^`.repeat(16), 'cyan'));
+    console.log(''); // force new line
+    return tapParser;
+  }
+
+  public async runInChrome(fileNameArg: string): Promise<TapParser> {
+    console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in chromium runtime.`);
+    console.log(cs(`=`.repeat(16), '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(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 () => {
+        let logStore = 'Starting log capture\n';
+        // tslint:disable-next-line: max-classes-per-file
+        class Deferred<T> {
+          public promise: Promise<T>;
+          public resolve;
+          public reject;
+          public status;
+
+          public startedAt: number;
+          public stoppedAt: number;
+          public get duration(): number {
+            if (this.stoppedAt) {
+              return this.stoppedAt - this.startedAt;
+            } else {
+              return Date.now() - this.startedAt;
+            }
+          }
+
+          constructor() {
+            this.promise = new Promise<T>((resolve, reject) => {
+              this.resolve = (valueArg: T | PromiseLike<T>) => {
+                this.status = 'fulfilled';
+                this.stoppedAt = Date.now();
+                resolve(valueArg);
+              };
+              this.reject = (reason: any) => {
+                this.status = 'rejected';
+                this.stoppedAt = Date.now();
+                reject(reason);
+              };
+              this.startedAt = Date.now();
+              this.status = 'pending';
+            });
+          }
+        }
+        const done = new Deferred();
+        const convertToText = (obj) => {
+          // create an array that will later be joined into a string.
+          const stringArray = [];
+
+          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('');
+        };
+        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 bundle = await (await fetch('/test__test.browser.ts.js')).text();
+        try  {
+          // tslint:disable-next-line: no-eval
+          eval(bundle);
+        } catch (err) {
+          console.error(err);
+        }
+        setTimeout(() => {
+          console.log(globalThis.testdom);
+          done.resolve();
+        }, 5000);
+        await done.promise;
+        return logStore;
+      }
+    );
+    await plugins.smartdelay.delayFor(1000);
+    await this.smartbrowserInstance.stop();
+    console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance.`);
+    await server.stop();
+    console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} server.`);
+    // lets create the tap parser
+    const tapParser = new TapParser(fileNameArg);
+    tapParser.handleTapLog(evaluation);
+    return tapParser;
+  }
+
+  public async runInDeno() {}
 }

ts/tstest.plugins.ts

@@ -1,14 +1,28 @@
 // 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';
 
+export { consolecolor, smartbrowser, smartexpress, smartdelay, smartfile, smartlog, smartpromise, smartshell };
+
+// @gitzone scope
+import * as tsbundle from '@gitzone/tsbundle';
+
+export {
+  tsbundle
+};
+
 // sindresorhus
 import * as figures from 'figures';
 
-export { consolecolor, figures, path, smartfile, smartlog, smartpromise, smartshell };
+export { figures };