.gitlab-ci.yml

@@ -0,0 +1,128 @@
+# 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:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
+
+# ====================
+# security stage
+# ====================
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
+  tags:
+    - lossless
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command pnpm audit --audit-level=high --dev
+  tags:
+    - lossless
+    - docker
+  allow_failure: true
+
+# ====================
+# test stage
+# ====================
+
+testStable:
+  stage: test
+  script:
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - docker
+
+testBuild:
+  stage: test
+  script:
+    - 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 typescript
+    - npmci npm prepare
+    - npmci npm install
+  tags:
+    - lossless
+    - docker
+    - priv
+
+trigger:
+  stage: metadata
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+pages:
+  stage: metadata
+  script:
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run buildDocs
+  tags:
+    - lossless
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - public
+  allow_failure: true

changelog.md

@@ -1,153 +0,0 @@
-# Changelog
-
-## 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 '@git.zone/tsrun';
+import * as tsrun from '@gitzone/tsrun';
 tsrun.runPath('./cli.child.js', import.meta.url);

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@git.zone/tstest",
+  "name": "@gitzone/tstest",
-  "version": "1.0.96",
+  "version": "1.0.77",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
@@ -20,24 +20,22 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.2.0",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@types/node": "^22.10.9"
+    "@types/node": "^20.4.2"
   },
   "dependencies": {
-    "@api.global/typedserver": "^3.0.53",
+    "@apiglobal/typedserver": "^2.0.65",
-    "@git.zone/tsbundle": "^2.1.0",
+    "@gitzone/tsbundle": "^2.0.8",
-    "@git.zone/tsrun": "^1.3.3",
+    "@gitzone/tsrun": "^1.2.43",
-    "@push.rocks/consolecolor": "^2.0.2",
+    "@push.rocks/consolecolor": "^2.0.1",
-    "@push.rocks/smartbrowser": "^2.0.8",
+    "@push.rocks/smartbrowser": "^2.0.5",
-    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartdelay": "^3.0.2",
-    "@push.rocks/smartfile": "^11.1.5",
+    "@push.rocks/smartfile": "^10.0.28",
-    "@push.rocks/smartlog": "^3.0.7",
+    "@push.rocks/smartlog": "^3.0.3",
-    "@push.rocks/smartpromise": "^4.2.0",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@push.rocks/smartshell": "^3.2.2",
+    "@push.rocks/smartshell": "^3.0.3",
-    "@push.rocks/tapbundle": "^5.5.6",
+    "@push.rocks/tapbundle": "^5.0.12",
-    "@types/ws": "^8.5.14",
+    "figures": "^5.0.0"
-    "figures": "^6.1.0",
-    "ws": "^8.18.0"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

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

ts/tstest.classes.tap.parser.ts

@@ -18,8 +18,6 @@ export class TapParser {
   testStatusRegex = /(ok|not\sok)\s([0-9]+)\s-\s(.*)\s#\stime=(.*)ms$/;
   activeTapTestResult: TapTestResult;
 
-  pretaskRegex = /^::__PRETASK:(.*)$/;
-
   /**
    * the constructor for TapParser
    */
@@ -51,12 +49,6 @@ 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);
@@ -157,7 +149,7 @@ export class TapParser {
       this._processLog(data);
     });
     childProcessArg.on('exit', async () => {
-      await this.evaluateFinalResult();
+      await this._evaluateResult();
       done.resolve();
     });
     await done.promise;
@@ -165,9 +157,10 @@ export class TapParser {
 
   public async handleTapLog(tapLog: string) {
     this._processLog(tapLog);
+    await this._evaluateResult();
   }
 
-  public async evaluateFinalResult() {
+  private async _evaluateResult() {
     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,82 +129,97 @@ 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 () => {
-        // lets enable real time comms
+        const convertToText = (obj: any): string => {
-        const ws = new WebSocket('ws://localhost:8080');
+          // create an array that will later be joined into a string.
-        await new Promise((resolve) => (ws.onopen = resolve));
+          const stringArray: string[] = [];
-
-        // Ensure this function is declared with 'async'
-        const logStore = [];
-        const originalLog = console.log;
-        const originalError = console.error;
-
-        // Override console methods to capture the logs
-        console.log = (...args) => {
-          logStore.push(args.join(' '));
-          ws.send(args.join(' '));
-          originalLog(...args);
-        };
-        console.error = (...args) => {
-          logStore.push(args.join(' '));
-          ws.send(args.join(' '));
-          originalError(...args);
-        };
-
-        const bundleName = new URLSearchParams(window.location.search).get('bundleName');
-        originalLog(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`);
-
-        try {
-          // 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)}`);
 
+          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);
         }
 
-        return logStore.join('\n');
+        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();
-    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
-    await tapParser.evaluateFinalResult();
+    const tapParser = new TapParser(fileNameArg + ':chrome');
+    tapParser.handleTapLog(evaluation);
     return tapParser;
   }
 

ts/tstest.logprefixes.ts

@@ -2,7 +2,6 @@ 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 '@api.global/typedserver';
+import * as typedserver from '@apiglobal/typedserver';
 
 export {
   typedserver
@@ -32,7 +32,7 @@ export {
 };
 
 // @gitzone scope
-import * as tsbundle from '@git.zone/tsbundle';
+import * as tsbundle from '@gitzone/tsbundle';
 
 export { tsbundle };
 
@@ -40,10 +40,3 @@ export { tsbundle };
 import figures from 'figures';
 
 export { figures };
-
-// third party
-import * as ws from 'ws';
-
-export {
-  ws
-}

tsconfig.json

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