1.0.86

cli.ts.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
 
-import * as tsrun from '@gitzone/tsrun';
+import * as tsrun from '@git.zone/tsrun';
 tsrun.runPath('./cli.child.js', import.meta.url);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tstest",
-  "version": "1.0.78",
+  "version": "1.0.86",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
@@ -20,22 +20,24 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsbuild": "^2.1.72",
-    "@types/node": "^20.4.2"
+    "@types/node": "^20.11.5"
   },
   "dependencies": {
-    "@apiglobal/typedserver": "^2.0.65",
+    "@api.global/typedserver": "^3.0.20",
-    "@gitzone/tsbundle": "^2.0.8",
+    "@git.zone/tsbundle": "^2.0.15",
-    "@gitzone/tsrun": "^1.2.44",
+    "@git.zone/tsrun": "^1.2.46",
     "@push.rocks/consolecolor": "^2.0.1",
-    "@push.rocks/smartbrowser": "^2.0.5",
+    "@push.rocks/smartbrowser": "^2.0.6",
     "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartfile": "^10.0.28",
+    "@push.rocks/smartfile": "^11.0.4",
     "@push.rocks/smartlog": "^3.0.3",
     "@push.rocks/smartpromise": "^4.0.3",
     "@push.rocks/smartshell": "^3.0.3",
-    "@push.rocks/tapbundle": "^5.0.12",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "figures": "^5.0.0"
+    "@types/ws": "^8.5.10",
+    "figures": "^6.0.1",
+    "ws": "^8.16.0"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tstest',
-  version: '1.0.78',
+  version: '1.0.86',
   description: 'a test utility to run tests that match test/**/*.ts'
 }

ts/tstest.classes.tap.parser.ts

@@ -18,6 +18,8 @@ export class TapParser {
   testStatusRegex = /(ok|not\sok)\s([0-9]+)\s-\s(.*)\s#\stime=(.*)ms$/;
   activeTapTestResult: TapTestResult;
 
+  pretaskRegex = /^::__PRETASK:(.*)$/;
+
   /**
    * the constructor for TapParser
    */
@@ -49,6 +51,12 @@ export class TapParser {
 
         // initiating first TapResult
         this._getNewTapTestResult();
+      } else if (this.pretaskRegex.test(logLine)) {
+        logLineIsTapProtocol = true;
+        const pretaskContentMatch = this.pretaskRegex.exec(logLine);
+        if (pretaskContentMatch && pretaskContentMatch[1]) {
+          console.log(`${logPrefixes.TapPretaskPrefix} Pretask ->${pretaskContentMatch[1]}: Success.`);
+        }
       } else if (this.testStatusRegex.test(logLine)) {
         logLineIsTapProtocol = true;
         const regexResult = this.testStatusRegex.exec(logLine);
@@ -149,7 +157,7 @@ export class TapParser {
       this._processLog(data);
     });
     childProcessArg.on('exit', async () => {
-      await this._evaluateResult();
+      await this.evaluateFinalResult();
       done.resolve();
     });
     await done.promise;
@@ -157,10 +165,9 @@ export class TapParser {
 
   public async handleTapLog(tapLog: string) {
     this._processLog(tapLog);
-    await this._evaluateResult();
   }
 
-  private async _evaluateResult() {
+  public async evaluateFinalResult() {
     this.receivedTests = this.testStore.length;
 
     // check wether all tests ran

ts/tstest.classes.testdirectory.ts

@@ -1,6 +1,6 @@
 import * as plugins from './tstest.plugins.js';
 import * as paths from './tstest.paths.js';
-import { Smartfile } from '@push.rocks/smartfile';
+import { SmartFile } from '@push.rocks/smartfile';
 
 // tap related stuff
 import { TapCombinator } from './tstest.classes.tap.combinator.js';
@@ -26,7 +26,7 @@ export class TestDirectory {
   /**
    * an array of Smartfiles
    */
-  testfileArray: Smartfile[] = [];
+  testfileArray: SmartFile[] = [];
 
   /**
    * the constructor for TestDirectory

ts/tstest.classes.tstest.ts

@@ -129,97 +129,68 @@ export class TsTest {
     server.addRoute('*', new plugins.typedserver.servertools.HandlerStatic(tsbundleCacheDirPath));
     await server.start();
 
+    // lets handle realtime comms
+    const tapParser = new TapParser(fileNameArg + ':chrome');
+    const wss = new plugins.ws.WebSocketServer({ port: 8080 });
+    wss.on('connection', (ws) => {
+      ws.on('message', (message) => {
+        tapParser.handleTapLog(message.toString());
+      });
+    });
+
     // 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 => {
+        // lets enable real time comms
-          // create an array that will later be joined into a string.
+        const ws = new WebSocket('ws://localhost:8080');
-          const stringArray: string[] = [];
+        await new Promise((resolve) => (ws.onopen = resolve));
 
-          if (typeof obj === 'object' && typeof obj.toString === 'function') {
+        // Ensure this function is declared with 'async'
-            stringArray.push(obj.toString());
+        const logStore = [];
-          } else if (typeof obj === 'object' && obj.join === undefined) {
+        const originalLog = console.log;
-            stringArray.push('{');
+        const originalError = console.error;
-            for (const prop of Object.keys(obj)) {
-              stringArray.push(prop, ': ', convertToText(obj[prop]), ',');
-            }
-            stringArray.push('}');
 
-            // is array
+        // Override console methods to capture the logs
-          } 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) => {
+          logStore.push(args.join(' '));
-            return typeof argument !== 'string' ? convertToText(argument) : argument;
+          ws.send(args.join(' '));
-          });
+          originalLog(...args);
-          logStore += `${args}\n`;
-          log(...args);
         };
-        const error = console.error;
         console.error = (...args) => {
-          args = args.map((argument) => {
+          logStore.push(args.join(' '));
-            return typeof argument !== 'string' ? convertToText(argument) : argument;
+          ws.send(args.join(' '));
-          });
+          originalError(...args);
-          logStore += `${args}\n`;
-          error(...args);
         };
+
         const bundleName = new URLSearchParams(window.location.search).get('bundleName');
-        console.log(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`);
+        originalLog(`::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
+          // Dynamically import the test module
-          eval(bundle);
+          const testModule = await import(`/${bundleName}`);
+          if (testModule && testModule.runTest) {
+            // Execute the exported test function
+            await testModule.runTest();
+          } else {
+            originalError('Test module does not export runTest function.');
+          }
         } catch (err) {
-          console.error(err);
+          originalError(err);
         }
 
-        if (
+        return logStore.join('\n');
-          (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();
+    wss.close();
     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');
+    await tapParser.evaluateFinalResult();
-    tapParser.handleTapLog(evaluation);
     return tapParser;
   }
 

ts/tstest.logprefixes.ts

@@ -2,6 +2,7 @@ import * as plugins from './tstest.plugins.js';
 import { coloredString as cs } from '@push.rocks/consolecolor';
 
 export const TapPrefix = cs(`::TAP::`, 'pink', 'black');
+export const TapPretaskPrefix = cs(`::PRETASK::`, 'cyan', 'black');
 export const TapErrorPrefix = cs(` !!!TAP PROTOCOL ERROR!!! `, 'red', 'black');
 
 export const TsTestPrefix = cs(`**TSTEST**`, 'pink', 'black');

ts/tstest.plugins.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 export { path };
 
 // @apiglobal scope
-import * as typedserver from '@apiglobal/typedserver';
+import * as typedserver from '@api.global/typedserver';
 
 export {
   typedserver
@@ -32,7 +32,7 @@ export {
 };
 
 // @gitzone scope
-import * as tsbundle from '@gitzone/tsbundle';
+import * as tsbundle from '@git.zone/tsbundle';
 
 export { tsbundle };
 
@@ -40,3 +40,10 @@ export { tsbundle };
 import figures from 'figures';
 
 export { figures };
+
+// third party
+import * as ws from 'ws';
+
+export {
+  ws
+}

tsconfig.json

@@ -3,9 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "NodeNext",
-    "moduleResolution": "nodenext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": true
-  }
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }