1.1.0

.gitlab-ci.yml

@@ -1,141 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - 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
-  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
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

changelog.md

@@ -0,0 +1,162 @@
+# Changelog
+
+## 2025-05-15 - 1.1.0 - feat(cli)
+Enhance test discovery with support for single file and glob pattern execution using improved CLI argument detection
+
+- Detect execution mode (file, glob, directory) based on CLI input in ts/index.ts
+- Refactor TestDirectory to load test files using SmartFile for single file and glob patterns
+- Update TsTest to pass execution mode and adjust test discovery accordingly
+- Bump dependency versions for typedserver, tsbundle, tapbundle, and others
+- Add .claude/settings.local.json for updated permissions configuration
+
+## 2025-01-23 - 1.0.96 - fix(TsTest)
+Fixed improper type-check for promise-like testModule defaults
+
+- Corrected the type-check for promise-like default exports in test modules
+- Removed unnecessary setTimeout used for async execution
+
+## 2025-01-23 - 1.0.95 - fix(core)
+Fix delay handling in Chrome test execution
+
+- Replaced smartdelay.delayFor with native Promise-based delay mechanism in runInChrome method.
+
+## 2025-01-23 - 1.0.94 - fix(TsTest)
+Fix test module execution by ensuring promise resolution delay
+
+- Added a delay to ensure promise resolution when dynamically importing test modules in the runInChrome method.
+
+## 2025-01-23 - 1.0.93 - fix(tstest)
+Handle globalThis.tapPromise in browser runtime evaluation
+
+- Added support for using globalThis.tapPromise in the browser evaluation logic.
+- Added log messages to indicate the usage of globalThis.tapPromise.
+
+## 2025-01-23 - 1.0.92 - fix(core)
+Improve error logging for test modules without default promise
+
+- Added logging to display the exported test module content when it does not export a default promise.
+
+## 2025-01-23 - 1.0.91 - fix(core)
+Refactored tstest class to enhance promise handling for test modules.
+
+- Removed .gitlab-ci.yml configuration file.
+- Updated package.json dependency versions.
+- Added a condition to handle promiselike objects in tests.
+
+## 2024-04-18 - 1.0.89 to 1.0.90 - Enhancements and Bug Fixes
+Multiple updates and fixes have been made.
+
+- Updated core components to enhance stability and performance.
+
+## 2024-03-07 - 1.0.86 to 1.0.88 - Core Updates
+Continued improvements and updates in the core module.
+
+- Applied critical fixes to enhance core stability.
+
+## 2024-01-19 - 1.0.85 to 1.0.89 - Bug Fixes
+Series of core updates have been implemented.
+
+- Addressed known bugs and improved overall system functionality.
+
+## 2023-11-09 - 1.0.81 to 1.0.84 - Maintenance Updates
+Maintenance updates focusing on core reliability.
+
+- Improved core module through systematic updates.
+- Strengthened system robustness.
+
+## 2023-08-26 - 1.0.77 to 1.0.80 - Critical Fixes
+Critical fixes implemented in core functionality.
+
+- Enhanced core processing to fix existing issues.
+
+## 2023-07-13 - 1.0.75 to 1.0.76 - Stability Improvements
+Stability enhancements and minor improvements.
+
+- Focused on ensuring a stable operational core.
+
+## 2022-11-08 - 1.0.73 to 1.0.74 - Routine Fixes
+Routine core fixes to address reported issues.
+
+- Addressed minor issues in the core module.
+
+## 2022-08-03 - 1.0.71 to 1.0.72 - Core Enhancements
+Enhancements applied to core systems.
+
+- Tweaked core components for enhanced reliability.
+
+## 2022-05-04 - 1.0.69 to 1.0.70 - System Reliability Fixes
+Fixes targeting the reliability of the core systems.
+
+- Improved system reliability through targeted core updates.
+
+## 2022-03-17 - 1.0.65 to 1.0.68 - Major Core Updates
+Major updates and bug fixes delivered for core components.
+
+- Enhanced central operations through key updates.
+
+## 2022-02-15 - 1.0.60 to 1.0.64 - Core Stability Improvements
+Focused updates on core stability and performance.
+
+- Reinforced stability through systematic core changes.
+
+## 2021-11-07 - 1.0.54 to 1.0.59 - Core Fixes and Improvements
+Multiple core updates aimed at fixing and improving the system.
+
+- Addressed outstanding bugs and improved performance in the core.
+
+## 2021-08-20 - 1.0.50 to 1.0.53 - Core Functionality Updates
+Continued updates to improve core functionality and user experience.
+
+- Implemented essential core fixes to enhance user experience.
+
+## 2020-10-01 - 1.0.44 to 1.0.49 - Core System Enhancements
+Critical enhancements to core systems.
+
+- Improved core operations and tackled existing issues.
+
+## 2020-09-29 - 1.0.40 to 1.0.43 - Essential Fixes
+Series of essential fixes for the core system.
+
+- Rectified known issues and bolstered core functionalities.
+
+## 2020-07-10 - 1.0.35 to 1.0.39 - Core Function Fixes
+Focused improvements and fixes for critical components.
+
+- Addressed critical core functions to boost system performance.
+
+## 2020-06-01 - 1.0.31 to 1.0.34 - Core Updates
+Updates to maintain core functionality efficacy.
+
+- Fixed inefficiencies and updated essential components.
+
+## 2019-10-02 - 1.0.26 to 1.0.29 - Core Maintenance
+Regular maintenance and updates for core reliability.
+
+- Addressed multiple core issues and enhanced system stability.
+
+## 2019-05-28 - 1.0.20 to 1.0.25 - Core Improvements
+General improvements targeting core functionalities.
+
+- Made systematic improvements to core processes.
+
+## 2019-04-08 - 1.0.16 to 1.0.19 - Bug Squashing
+Resolved numerous issues within core operations.
+
+- Fixed and optimized core functionalities for better performance.
+  
+## 2018-12-06 - 1.0.15 - Dependency Updates
+Updates aimed at improving dependency management.
+
+- Ensured dependencies are up-to-date for optimal performance.
+  
+## 2018-08-14 - 1.0.14 - Test Improvement
+Major improvements in testing mechanisms and logging.
+
+- Improved test results handling for accuracy and reliability.
+- Enhanced logging features for increased clarity.
+  
+## 2018-08-04 - 1.0.1 to 1.0.13 - Initial Implementation and Fixes
+Initial release and critical updates focusing on core stability and functionality.
+
+- Implemented core components and established initial system structure.
+- Addressed key bugs and enhanced initial functionality.

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

contribute.md

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

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@gitzone/tstest",
-  "version": "1.0.74",
+  "name": "@git.zone/tstest",
+  "version": "1.1.0",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
@@ -16,25 +16,28 @@
     "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/ --web",
     "cleanUp": "rm -rf .nogit/sandbox-npmts",
-    "build": "(tsbuild --web --allowimplicitany)"
+    "build": "(tsbuild --web --allowimplicitany  --skiplibcheck)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
-    "@types/node": "^18.11.9"
+    "@git.zone/tsbuild": "^2.5.1",
+    "@types/node": "^22.15.18"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^2.0.6",
-    "@gitzone/tsrun": "^1.2.37",
-    "@pushrocks/consolecolor": "^2.0.1",
-    "@pushrocks/smartbrowser": "^2.0.5",
-    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartexpress": "^4.0.21",
-    "@pushrocks/smartfile": "^10.0.4",
-    "@pushrocks/smartlog": "^3.0.1",
-    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartshell": "^2.0.30",
-    "@pushrocks/tapbundle": "^5.0.4",
-    "figures": "^5.0.0"
+    "@api.global/typedserver": "^3.0.74",
+    "@git.zone/tsbundle": "^2.2.5",
+    "@git.zone/tsrun": "^1.3.3",
+    "@push.rocks/consolecolor": "^2.0.2",
+    "@push.rocks/smartbrowser": "^2.0.8",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartfile": "^11.2.0",
+    "@push.rocks/smartlog": "^3.0.9",
+    "@push.rocks/smartpromise": "^4.2.3",
+    "@push.rocks/smartshell": "^3.2.3",
+    "@push.rocks/tapbundle": "^6.0.3",
+    "@types/ws": "^8.18.1",
+    "figures": "^6.1.0",
+    "ws": "^8.18.2"
   },
   "files": [
     "ts/**/*",
@@ -50,5 +53,6 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39"
 }

readme.plan.md

@@ -0,0 +1,51 @@
+# Plan for adding single file and glob pattern execution support to tstest
+
+!! FIRST: Reread /home/philkunz/.claude/CLAUDE.md to ensure following all guidelines !!
+
+## Goal - ✅ COMPLETED
+- ✅ Make `tstest test/test.abc.ts` run the specified file directly
+- ✅ Support glob patterns like `tstest test/*.spec.ts` or `tstest test/**/*.test.ts`
+- ✅ Maintain backward compatibility with directory argument
+
+## Current behavior - UPDATED
+- ✅ tstest now supports three modes: directory, single file, and glob patterns
+- ✅ Directory mode now searches recursively using `**/test*.ts` pattern
+- ✅ Single file mode runs a specific test file
+- ✅ Glob mode runs files matching the pattern
+
+## Completed changes
+
+### 1. ✅ Update cli argument handling in index.ts
+- ✅ Detect argument type: file path, glob pattern, or directory
+- ✅ Check if argument contains glob characters (*, **, ?, [], etc.)
+- ✅ Pass appropriate mode to TsTest constructor
+- ✅ Added TestExecutionMode enum
+
+### 2. ✅ Modify TsTest constructor and class
+- ✅ Add support for three modes: directory, file, glob
+- ✅ Update constructor to accept pattern/path and mode
+- ✅ Added executionMode property to track the mode
+
+### 3. ✅ Update TestDirectory class
+- ✅ Used `listFileTree` for glob pattern support
+- ✅ Used `SmartFile.fromFilePath` for single file loading
+- ✅ Refactored to support all three modes in `_init` method
+- ✅ Return appropriate file array based on mode
+- ✅ Changed default directory behavior to recursive search
+  - ✅ When directory argument: use `**/test*.ts` pattern for recursive search
+  - ✅ This ensures subdirectories are included in test discovery
+
+### 4. ✅ Test the implementation
+- ✅ Created test file `test/test.single.ts` for single file functionality
+- ✅ Created test file `test/test.glob.ts` for glob pattern functionality
+- ✅ Created test in subdirectory `test/subdir/test.sub.ts` for recursive search
+- ✅ Tested with existing test files for backward compatibility
+- ✅ Tested glob patterns: `test/test.*.ts` works correctly
+- ✅ Verified that default behavior now includes subdirectories
+
+## Implementation completed
+1. ✅ CLI argument type detection implemented
+2. ✅ TsTest class supports all three modes
+3. ✅ TestDirectory handles files, globs, and directories
+4. ✅ Default pattern changed from `test*.ts` to `**/test*.ts` for recursive search
+5. ✅ Comprehensive tests added and all modes verified

test/subdir/test.sub.ts

@@ -0,0 +1,8 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+
+tap.test('subdirectory test execution', async () => {
+  console.log('This test verifies subdirectory test discovery works');
+  expect(true).toBeTrue();
+});
+
+tap.start();

test/test.glob.ts

@@ -0,0 +1,8 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+
+tap.test('glob pattern test execution', async () => {
+  console.log('This test verifies glob pattern execution works');
+  expect(true).toBeTrue();
+});
+
+tap.start();

test/test.single.ts

@@ -0,0 +1,8 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+
+tap.test('single file test execution', async () => {
+  console.log('This test verifies single file execution works');
+  expect(true).toBeTrue();
+});
+
+tap.start();

test/test.ts

@@ -1,4 +1,4 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as tstest from '../ts/index.js';
 
 tap.test('prepare test', async () => {});

ts/00_commitinfo_data.ts

@@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export const commitinfo = {
-  name: '@gitzone/tstest',
-  version: '1.0.74',
+  name: '@git.zone/tstest',
+  version: '1.1.0',
   description: 'a test utility to run tests that match test/**/*.ts'
 }

ts/index.ts

@@ -1,10 +1,29 @@
 import { TsTest } from './tstest.classes.tstest.js';
 
+export enum TestExecutionMode {
+  DIRECTORY = 'directory',
+  FILE = 'file',
+  GLOB = 'glob'
+}
+
 export const runCli = async () => {
   if (!process.argv[2]) {
-    console.error('You must specify a test directory as argument. Please try again.');
+    console.error('You must specify a test directory/file/pattern as argument. Please try again.');
     process.exit(1);
   }
-  const tsTestInstance = new TsTest(process.cwd(), process.argv[2]);
+  
+  const testPath = process.argv[2];
+  let executionMode: TestExecutionMode;
+  
+  // Detect execution mode based on the argument
+  if (testPath.includes('*') || testPath.includes('?') || testPath.includes('[') || testPath.includes('{')) {
+    executionMode = TestExecutionMode.GLOB;
+  } else if (testPath.endsWith('.ts')) {
+    executionMode = TestExecutionMode.FILE;
+  } else {
+    executionMode = TestExecutionMode.DIRECTORY;
+  }
+  
+  const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode);
   await tsTestInstance.run();
 };

ts/tstest.classes.tap.combinator.ts

@@ -2,7 +2,7 @@
 // combines different tap test files to an overall result
 // ============
 import * as plugins from './tstest.plugins.js';
-import { coloredString as cs } from '@pushrocks/consolecolor';
+import { coloredString as cs } from '@push.rocks/consolecolor';
 
 import { TapParser } from './tstest.classes.tap.parser.js';
 import * as logPrefixes from './tstest.logprefixes.js';

ts/tstest.classes.tap.parser.ts

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
-import { coloredString as cs } from '@pushrocks/consolecolor';
+import { coloredString as cs } from '@push.rocks/consolecolor';
 
 // ============
 // combines different tap test files to an overall result
@@ -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,7 @@
 import * as plugins from './tstest.plugins.js';
 import * as paths from './tstest.paths.js';
-import { Smartfile } from '@pushrocks/smartfile';
+import { SmartFile } from '@push.rocks/smartfile';
+import { TestExecutionMode } from './index.js';
 
 // tap related stuff
 import { TapCombinator } from './tstest.classes.tap.combinator.js';
@@ -14,43 +15,87 @@ export class TestDirectory {
   cwd: string;
 
   /**
-   * the relative location of the test dir
+   * the test path or pattern
    */
-  relativePath: string;
+  testPath: string;
 
   /**
-   * the absolute path of the test dir
+   * the execution mode
    */
-  absolutePath: string;
+  executionMode: TestExecutionMode;
 
   /**
    * an array of Smartfiles
    */
-  testfileArray: Smartfile[] = [];
+  testfileArray: SmartFile[] = [];
 
   /**
    * the constructor for TestDirectory
-   * tell it the path
-   * @param pathToTestDirectory
+   * @param cwdArg - the current working directory
+   * @param testPathArg - the test path/pattern
+   * @param executionModeArg - the execution mode
    */
-  constructor(cwdArg: string, relativePathToTestDirectory: string) {
+  constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode) {
     this.cwd = cwdArg;
-    this.relativePath = relativePathToTestDirectory;
+    this.testPath = testPathArg;
+    this.executionMode = executionModeArg;
   }
 
   private async _init() {
-    this.testfileArray = await plugins.smartfile.fs.fileTreeToObject(
-      plugins.path.join(this.cwd, this.relativePath),
-      'test*.ts'
-    );
+    switch (this.executionMode) {
+      case TestExecutionMode.FILE:
+        // Single file mode
+        const filePath = plugins.path.isAbsolute(this.testPath) 
+          ? this.testPath 
+          : plugins.path.join(this.cwd, this.testPath);
+        
+        if (await plugins.smartfile.fs.fileExists(filePath)) {
+          this.testfileArray = [await plugins.smartfile.SmartFile.fromFilePath(filePath)];
+        } else {
+          throw new Error(`Test file not found: ${filePath}`);
+        }
+        break;
+        
+      case TestExecutionMode.GLOB:
+        // Glob pattern mode - use listFileTree which supports glob patterns
+        const globPattern = this.testPath;
+        const matchedFiles = await plugins.smartfile.fs.listFileTree(this.cwd, globPattern);
+        
+        this.testfileArray = await Promise.all(
+          matchedFiles.map(async (filePath) => {
+            const absolutePath = plugins.path.isAbsolute(filePath) 
+              ? filePath 
+              : plugins.path.join(this.cwd, filePath);
+            return await plugins.smartfile.SmartFile.fromFilePath(absolutePath);
+          })
+        );
+        break;
+        
+      case TestExecutionMode.DIRECTORY:
+        // Directory mode - now recursive with ** pattern
+        const dirPath = plugins.path.join(this.cwd, this.testPath);
+        const testPattern = '**/test*.ts';
+        
+        const testFiles = await plugins.smartfile.fs.listFileTree(dirPath, testPattern);
+        
+        this.testfileArray = await Promise.all(
+          testFiles.map(async (filePath) => {
+            const absolutePath = plugins.path.isAbsolute(filePath)
+              ? filePath
+              : plugins.path.join(dirPath, filePath);
+            return await plugins.smartfile.SmartFile.fromFilePath(absolutePath);
+          })
+        );
+        break;
+    }
   }
 
   async getTestFilePathArray() {
     await this._init();
     const testFilePaths: string[] = [];
     for (const testFile of this.testfileArray) {
-      const filePath = plugins.path.join(this.relativePath, testFile.path);
-      testFilePaths.push(filePath);
+      // Use the path directly from the SmartFile
+      testFilePaths.push(testFile.path);
     }
     return testFilePaths;
   }

ts/tstest.classes.tstest.ts

@@ -2,14 +2,16 @@ import * as plugins from './tstest.plugins.js';
 import * as paths from './tstest.paths.js';
 import * as logPrefixes from './tstest.logprefixes.js';
 
-import { coloredString as cs } from '@pushrocks/consolecolor';
+import { coloredString as cs } from '@push.rocks/consolecolor';
 
 import { TestDirectory } from './tstest.classes.testdirectory.js';
 import { TapCombinator } from './tstest.classes.tap.combinator.js';
 import { TapParser } from './tstest.classes.tap.parser.js';
+import { TestExecutionMode } from './index.js';
 
 export class TsTest {
   public testDir: TestDirectory;
+  public executionMode: TestExecutionMode;
 
   public smartshellInstance = new plugins.smartshell.Smartshell({
     executor: 'bash',
@@ -20,8 +22,9 @@ export class TsTest {
 
   public tsbundleInstance = new plugins.tsbundle.TsBundle();
 
-  constructor(cwdArg: string, relativePathToTestDirectory: string) {
-    this.testDir = new TestDirectory(cwdArg, relativePathToTestDirectory);
+  constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode) {
+    this.executionMode = executionModeArg;
+    this.testDir = new TestDirectory(cwdArg, testPathArg, executionModeArg);
   }
 
   async run() {
@@ -45,11 +48,11 @@ export class TsTest {
           );
           console.log('!!!!!!!!!!!');
           break;
-        case (fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts' )):
+        case fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts'):
           const tapParserBrowser = await this.runInChrome(fileNameArg);
           tapCombinator.addTapParser(tapParserBrowser);
           break;
-        case (fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts')):
+        case fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts'):
           console.log('>>>>>>> TEST PART 1: chrome');
           const tapParserBothBrowser = await this.runInChrome(fileNameArg);
           tapCombinator.addTapParser(tapParserBothBrowser);
@@ -101,17 +104,17 @@ export class TsTest {
     // lets bundle the test
     await plugins.smartfile.fs.ensureEmptyDir(tsbundleCacheDirPath);
     await this.tsbundleInstance.build(process.cwd(), fileNameArg, bundleFilePath, {
-      bundler: 'esbuild'
+      bundler: 'esbuild',
     });
 
     // lets create a server
-    const server = new plugins.smartexpress.Server({
+    const server = new plugins.typedserver.servertools.Server({
       cors: true,
       port: 3007,
     });
     server.addRoute(
       '/test',
-      new plugins.smartexpress.Handler('GET', async (req, res) => {
+      new plugins.typedserver.servertools.Handler('GET', async (req, res) => {
         res.type('.html');
         res.write(`
         <html>
@@ -126,100 +129,85 @@ export class TsTest {
         res.end();
       })
     );
-    server.addRoute('*', new plugins.smartexpress.HandlerStatic(tsbundleCacheDirPath));
+    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 => {
-          // create an array that will later be joined into a string.
-          const stringArray: string[] = [];
+        // lets enable real time comms
+        const ws = new WebSocket('ws://localhost:8080');
+        await new Promise((resolve) => (ws.onopen = resolve));
 
-          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('}');
+        // Ensure this function is declared with 'async'
+        const logStore = [];
+        const originalLog = console.log;
+        const originalError = console.error;
 
-            // 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);
+        // Override console methods to capture the logs
         console.log = (...args) => {
-          args = args.map((argument) => {
-            return typeof argument !== 'string' ? convertToText(argument) : argument;
-          });
-          logStore += `${args}\n`;
-          log(...args);
+          logStore.push(args.join(' '));
+          ws.send(args.join(' '));
+          originalLog(...args);
         };
-        const error = console.error;
         console.error = (...args) => {
-          args = args.map((argument) => {
-            return typeof argument !== 'string' ? convertToText(argument) : argument;
-          });
-          logStore += `${args}\n`;
-          error(...args);
+          logStore.push(args.join(' '));
+          ws.send(args.join(' '));
+          originalError(...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}`);
+        originalLog(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`);
+
         try {
-          // tslint:disable-next-line: no-eval
-          eval(bundle);
+          // Dynamically import the test module
+          const testModule = await import(`/${bundleName}`);
+          if (testModule && testModule.default && testModule.default instanceof Promise) {
+            // Execute the exported test function
+            await testModule.default;
+          } else if (testModule && testModule.default && typeof testModule.default.then === 'function') {
+            console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            console.log('Test module default export is just promiselike: Something might be messing with your Promise implementation.');
+            console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            await testModule.default;
+          } else if (globalThis.tapPromise && typeof globalThis.tapPromise.then === 'function') {
+            console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            console.log('Using globalThis.tapPromise');
+            console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            await testModule.default;
+          } else {
+            console.error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            console.error('Test module does not export a default promise.');
+            console.error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            console.log(`We got: ${JSON.stringify(testModule)}`);
+
+          }
         } 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;
+        return logStore.join('\n');
       }
     );
     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');
-    tapParser.handleTapLog(evaluation);
+    await tapParser.evaluateFinalResult();
     return tapParser;
   }
 

ts/tstest.logprefixes.ts

@@ -1,7 +1,8 @@
 import * as plugins from './tstest.plugins.js';
-import { coloredString as cs } from '@pushrocks/consolecolor';
+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

@@ -3,21 +3,26 @@ 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';
+// @apiglobal scope
+import * as typedserver from '@api.global/typedserver';
+
+export {
+  typedserver
+}
+
+// @push.rocks scope
+import * as consolecolor from '@push.rocks/consolecolor';
+import * as smartbrowser from '@push.rocks/smartbrowser';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartfile from '@push.rocks/smartfile';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartshell from '@push.rocks/smartshell';
+import * as tapbundle from '@push.rocks/tapbundle';
 
 export {
   consolecolor,
   smartbrowser,
-  smartexpress,
   smartdelay,
   smartfile,
   smartlog,
@@ -27,7 +32,7 @@ export {
 };
 
 // @gitzone scope
-import * as tsbundle from '@gitzone/tsbundle';
+import * as tsbundle from '@git.zone/tsbundle';
 
 export { tsbundle };
 
@@ -35,3 +40,10 @@ export { tsbundle };
 import figures from 'figures';
 
 export { figures };
+
+// third party
+import * as ws from 'ws';
+
+export {
+  ws
+}

tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}